From 00c5187904e9617f830f991bdab6fff7a6561e31 Mon Sep 17 00:00:00 2001
From: Poompatai Puntitpong <poompatai@google.com>
Date: Tue, 27 Sep 2022 05:17:11 +0000
Subject: [PATCH 1/3] Remove android.hardware.bluetooth.audio HAL from manifest

This HAL has been replaced with AIDL, so it does not exist anymore,
causing VtsHalBluetoothAudioV2_0TargetTest and VtsHalBluetoothAudioV2_1TargetTest
to fail.

Bug: 231275829
Test: presubmit
Test: VTS VtsHalBluetoothAudioV2_0TargetTest VtsHalBluetoothAudioV2_1TargetTest
Change-Id: I9df7d4eb0b06cdbca2ac42a05d227b78897e0918
Merged-In: Ie091dfce3c63be4fd6d0ed5b6600587aa56862cd
---
 manifest_64.xml | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/manifest_64.xml b/manifest_64.xml
index a8b512be..5d43f5cf 100644
--- a/manifest_64.xml
+++ b/manifest_64.xml
@@ -62,15 +62,6 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl">
-        <name>android.hardware.bluetooth.audio</name>
-        <transport>hwbinder</transport>
-        <version>2.1</version>
-        <interface>
-            <name>IBluetoothAudioProvidersFactory</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format="hidl">
         <name>android.hardware.boot</name>
         <transport>hwbinder</transport>

From 2e58ceae222952ec976b9209db9fea6d94ab3531 Mon Sep 17 00:00:00 2001
From: Speth Chang <spethchang@google.com>
Date: Fri, 14 Oct 2022 11:13:23 +0800
Subject: [PATCH 2/3] gs101: create catpipe folder for camera useage

The folder will be used for place the necessary libraries that used by
catpipe functions.

Bug: 249274299
Test: build pass, check the folder with user build
Change-Id: I275af8e716de8dc433f0b43afb20866a9eff8642
---
 conf/init.gs101.rc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/conf/init.gs101.rc b/conf/init.gs101.rc
index f0c07911..7503ae6f 100644
--- a/conf/init.gs101.rc
+++ b/conf/init.gs101.rc
@@ -411,6 +411,7 @@ on post-fs-data
 
 # Permissions Camera
     mkdir /data/vendor/camera 0770 system camera
+    mkdir /data/vendor/camera/catpipe 0770 system camera
     chmod 0755 /sys/kernel/debug/tracing
     restorecon /sys/kernel/debug/tracing/trace_marker
 

From edac0dda624f1212afd228541d843cc55f3d31a8 Mon Sep 17 00:00:00 2001
From: chenpaul <chenpaul@google.com>
Date: Wed, 15 Jun 2022 16:50:27 +0800
Subject: [PATCH 3/3] Enable SAE upgrade offload

Update wifi overaly to enable WPA2 to WPA3 auto-upgrade offload
to capable Driver/Firmware.
With this feature enabled, Pixel can support cross akm roaming.

Bug: 236096597
Bug: 236098039
Test: AU drop test
Test: Roaming and connection test (go/cross-akm-roaming)
Change-Id: I5556c5f8062127f8721e8677d22d2bfd08cec4e0
---
 rro_overlays/WifiOverlay/res/values/config.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/rro_overlays/WifiOverlay/res/values/config.xml b/rro_overlays/WifiOverlay/res/values/config.xml
index c63ff265..4addce85 100644
--- a/rro_overlays/WifiOverlay/res/values/config.xml
+++ b/rro_overlays/WifiOverlay/res/values/config.xml
@@ -141,4 +141,7 @@
 
     <!-- Enable aggregation of Wifi link layer radio stats from all radios -->
     <bool translatable="false" name="config_wifiLinkLayerAllRadiosStatsAggregationEnabled">true</bool>
+
+    <!-- Enable WPA2 to WPA3 auto-upgrade offload to capable Driver/Firmware -->
+    <bool translatable="false" name="config_wifiSaeUpgradeOffloadEnabled">true</bool>
 </resources>