From 71043f13f619b36e5a898fe10d1df4b2e75cf738 Mon Sep 17 00:00:00 2001
From: Jack Wu <wjack@google.com>
Date: Thu, 2 Mar 2023 17:35:33 +0800
Subject: [PATCH 1/4] gs101: update AIDL IGoogleBattery manifest version to 2

Bug: 271224032
Test: TH
Change-Id: Ic737349bdfb9e8342730ceef0da5308e443bfc1e
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 ef40fab5..8cd88346 100644
--- a/device_framework_matrix_product.xml
+++ b/device_framework_matrix_product.xml
@@ -113,7 +113,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 261b9dfaa06a5c66aef5116ddb23aac7cb2ebf7f Mon Sep 17 00:00:00 2001
From: Midas Chien <midaschieh@google.com>
Date: Wed, 1 Mar 2023 15:53:54 +0800
Subject: [PATCH 2/4] BoardConfig: support SKIP_VALIDATE by default

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

diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index 37f12e7d..d2da080f 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -222,7 +222,6 @@ BOARD_HWC_VERSION := libhwc2.1
 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 49b2eaf1514e49fbd72d97860cb90338a1317f07 Mon Sep 17 00:00:00 2001
From: Oscar Shu <xshu@google.com>
Date: Thu, 23 Feb 2023 23:33:14 +0000
Subject: [PATCH 3/4] Update overlay to support MAC randomization on open SSIDs

Bug: 270441948
Test: compile
Change-Id: I9042b2bd91f8fe97b285888aa04d208d9f9634f0
---
 rro_overlays/WifiOverlay/res/values/config.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rro_overlays/WifiOverlay/res/values/config.xml b/rro_overlays/WifiOverlay/res/values/config.xml
index ab512efa..5254b0a7 100644
--- a/rro_overlays/WifiOverlay/res/values/config.xml
+++ b/rro_overlays/WifiOverlay/res/values/config.xml
@@ -56,6 +56,7 @@
 
     <!-- True if the firmware supports connected MAC randomization -->
     <bool name="config_wifi_connected_mac_randomization_supported">true</bool>
+    <bool name="config_wifiAllowNonPersistentMacRandomizationOnOpenSsids">true</bool>
 
     <!-- True if the firmware supports p2p MAC randomization -->
     <bool name="config_wifi_p2p_mac_randomization_supported">true</bool>

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

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

This reverts commit 71043f13f619b36e5a898fe10d1df4b2e75cf738.

Change-Id: I3fbb85d3be3b106acc68856954c23d840049780c
---
 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 8cd88346..ef40fab5 100644
--- a/device_framework_matrix_product.xml
+++ b/device_framework_matrix_product.xml
@@ -113,7 +113,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>