From 5505ecb127c678ab31d6029eed86a3208de422de Mon Sep 17 00:00:00 2001
From: Jack Wu <wjack@google.com>
Date: Thu, 2 Mar 2023 17:18:44 +0800
Subject: [PATCH 1/3] gs201: update AIDL IGoogleBattery manifest version to 2

Bug: 271224032
Test: TH
Change-Id: I1ea5ff7669cebff79944263fbc842f6b60fd547e
Signed-off-by: Jack Wu <wjack@google.com>
---
 device_framework_matrix_product.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml
index b55e69eb..d48ceba7 100644
--- a/device_framework_matrix_product.xml
+++ b/device_framework_matrix_product.xml
@@ -137,7 +137,7 @@
     </hal>
     <hal format="aidl" optional="true">
         <name>vendor.google.google_battery</name>
-        <version>1</version>
+        <version>2</version>
         <interface>
             <name>IGoogleBattery</name>
             <instance>default</instance>

From 6cd40722a70a57b176bef8cb0c55c53e957465cd Mon Sep 17 00:00:00 2001
From: Midas Chien <midaschieh@google.com>
Date: Wed, 1 Mar 2023 15:55:10 +0800
Subject: [PATCH 2/3] BoardConfig: support SKIP_VALIDATE by default

Bug: 270479799
Test: VtsHalGraphicsComposer3_TargetTest
Change-Id: I6e03c533e3b08aa69d61d128a9ffb3c720b11a5b
---
 BoardConfig-common.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index 9b0006df..222b996c 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -259,7 +259,6 @@ BOARD_HWC_VERSION := hwc3
 TARGET_RUNNING_WITHOUT_SYNC_FRAMEWORK := false
 BOARD_HDMI_INCAPABLE := true
 TARGET_USES_HWC2 := true
-HWC_SKIP_VALIDATE := true
 HWC_SUPPORT_RENDER_INTENT := true
 HWC_SUPPORT_COLOR_TRANSFORM := true
 #BOARD_USES_DISPLAYPORT := true

From 3a0fbc172752357051c3d5b229a377ec1ca48ecb Mon Sep 17 00:00:00 2001
From: Jack Wu <wjack@google.com>
Date: Fri, 3 Mar 2023 19:11:24 +0800
Subject: [PATCH 3/3] Revert "gs201: update AIDL IGoogleBattery manifest
 version to 2"

Bug: 271224032
Test: TH
Reason for revert: Build Breakage on redfin

This reverts commit 5505ecb127c678ab31d6029eed86a3208de422de.

Change-Id: I545c41ac2cab068380a2f7286964b04e183226af
---
 device_framework_matrix_product.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml
index d48ceba7..b55e69eb 100644
--- a/device_framework_matrix_product.xml
+++ b/device_framework_matrix_product.xml
@@ -137,7 +137,7 @@
     </hal>
     <hal format="aidl" optional="true">
         <name>vendor.google.google_battery</name>
-        <version>2</version>
+        <version>1</version>
         <interface>
             <name>IGoogleBattery</name>
             <instance>default</instance>