From 818f1b9d9e4fd823e3a0c5a3407c803b05cb9dd5 Mon Sep 17 00:00:00 2001
From: Michele Berionne <mberionne@google.com>
Date: Wed, 18 May 2022 22:51:52 +0000
Subject: [PATCH 1/6] Add notification pregrant for OobConfig

Bug: 232002666
Change-Id: I5f9ed54fb4e020dd98fe94198ddd6cf782cdf415
Test: manual
---
 default-permissions.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/default-permissions.xml b/default-permissions.xml
index 82602eef..81624d3c 100644
--- a/default-permissions.xml
+++ b/default-permissions.xml
@@ -148,5 +148,10 @@
         <!-- Notifications -->
         <permission name="android.permission.POST_NOTIFICATIONS" fixed="false"/>
     </exception>
+    <exception
+        package="com.google.android.apps.work.oobconfig">
+        <!-- Notifications -->
+        <permission name="android.permission.POST_NOTIFICATIONS" fixed="true"/>
+    </exception>
 </exceptions>
 

From 2280d38b83b0e84ce22921461df87b02e127b252 Mon Sep 17 00:00:00 2001
From: SalmaxChang <salmaxchang@google.com>
Date: Thu, 12 May 2022 17:59:50 +0800
Subject: [PATCH 2/6] gs101: change carrier config path

Change to "/vendor/firmware/carrierconfig".

Bug: 232364874
Change-Id: I835f20e4e5640323c9d0f0bb8d6b9b11f00560b6
---
 device.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/device.mk b/device.mk
index c9df7841..f933ae26 100644
--- a/device.mk
+++ b/device.mk
@@ -111,7 +111,7 @@ PRODUCT_PRODUCT_PROPERTIES += \
 
 # Carrier configuration default location
 PRODUCT_PROPERTY_OVERRIDES += \
-	persist.vendor.radio.config.carrier_config_dir=/mnt/vendor/modem_img/images/default/confpack
+	persist.vendor.radio.config.carrier_config_dir=/vendor/firmware/carrierconfig
 
 
 PRODUCT_PROPERTY_OVERRIDES += \

From a722d436f8fdaa6424755582a4a50a83d365cb4a Mon Sep 17 00:00:00 2001
From: SalmaxChang <salmaxchang@google.com>
Date: Thu, 12 May 2022 17:59:50 +0800
Subject: [PATCH 3/6] gs101: change carrier config path

Change to "/vendor/firmware/carrierconfig".

Bug: 232364874
Change-Id: I835f20e4e5640323c9d0f0bb8d6b9b11f00560b6
---
 device.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/device.mk b/device.mk
index cfbf923b..38fa3d96 100644
--- a/device.mk
+++ b/device.mk
@@ -126,7 +126,7 @@ PRODUCT_PRODUCT_PROPERTIES += \
 
 # Carrier configuration default location
 PRODUCT_PROPERTY_OVERRIDES += \
-	persist.vendor.radio.config.carrier_config_dir=/mnt/vendor/modem_img/images/default/confpack
+	persist.vendor.radio.config.carrier_config_dir=/vendor/firmware/carrierconfig
 
 # Set the Bluetooth Class of Device
 # Service Field: 0x5A -> 90

From 339875dda808d8b7c66a3fca7947016c7a8897d3 Mon Sep 17 00:00:00 2001
From: jonerlin <jonerlin@google.com>
Date: Sun, 15 May 2022 11:06:22 +0800
Subject: [PATCH 4/6] Enable IBluetoothExt interface feature

Bug: 228943442
Test: Manually
Change-Id: I98bde91f74c5e4a4ffc6f9a4fb0fff48857de0be
---
 device_framework_matrix_product.xml | 8 ++++++++
 manifest.xml                        | 9 +++++++++
 2 files changed, 17 insertions(+)

diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml
index 7b191128..a1e4e779 100644
--- a/device_framework_matrix_product.xml
+++ b/device_framework_matrix_product.xml
@@ -102,6 +102,14 @@
             <instance>default</instance>
         </interface>
     </hal>
+    <hal format="hidl" optional="true">
+        <name>hardware.google.bluetooth.ext</name>
+        <version>1.0</version>
+        <interface>
+            <name>IBluetoothExt</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
     <hal format="hidl" optional="true">
         <name>hardware.google.bluetooth.ccc</name>
         <transport>hwbinder</transport>
diff --git a/manifest.xml b/manifest.xml
index a5ca7f37..1d59695c 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -115,6 +115,15 @@
             <instance>default</instance>
         </interface>
     </hal>
+    <hal format="hidl">
+        <name>hardware.google.bluetooth.ext</name>
+        <transport>hwbinder</transport>
+        <version>1.0</version>
+        <interface>
+            <name>IBluetoothExt</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
     <hal format="hidl">
         <name>hardware.google.bluetooth.sar</name>
         <transport>hwbinder</transport>

From adc935563512d9dffc936a6946432bacee300354 Mon Sep 17 00:00:00 2001
From: Allen Xu <xalle@google.com>
Date: Thu, 19 May 2022 23:50:20 +0000
Subject: [PATCH 5/6] Add notification pregrant for SCONE

Bug: 233243584
Change-Id: I9bb2b014c7edb665a7c2675e86ff4d67cde94b48
Test: manual
---
 default-permissions.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/default-permissions.xml b/default-permissions.xml
index 81624d3c..50860fed 100644
--- a/default-permissions.xml
+++ b/default-permissions.xml
@@ -66,6 +66,8 @@
     <exception package="com.google.android.apps.scone">
         <!-- Used to call ActivityTransition API for Smart PNO -->
         <permission name="android.permission.ACTIVITY_RECOGNITION" fixed="false"/>
+        <!-- Notifications -->
+        <permission name="android.permission.POST_NOTIFICATIONS" fixed="false"/>
     </exception>
 
     <exception

From 5c0cb06ff7e2443dc6faae73f1e6df4c9bbe93fd Mon Sep 17 00:00:00 2001
From: Jiakai Zhang <jiakaiz@google.com>
Date: Fri, 20 May 2022 14:58:28 +0100
Subject: [PATCH 6/6] Preopt SystemUI for AOSP builds.

Bug: 232860596
Test: See no dex2oat invocation on the first boot.
Change-Id: I051c3b4f7c1c695f487d527b652203e6e007aa8d
---
 device.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/device.mk b/device.mk
index 38fa3d96..3a85217e 100644
--- a/device.mk
+++ b/device.mk
@@ -1178,8 +1178,8 @@ PRODUCT_PACKAGES_DEBUG += BatteryStatsViewer
 DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE := device/google/gs101/device_framework_matrix_product.xml
 
 # Preopt SystemUI
-PRODUCT_DEXPREOPT_SPEED_APPS += \
-    SystemUIGoogle
+PRODUCT_DEXPREOPT_SPEED_APPS += SystemUIGoogle  # For internal
+PRODUCT_DEXPREOPT_SPEED_APPS += SystemUI  # For AOSP
 
 # Compile SystemUI on device with `speed`.
 PRODUCT_PROPERTY_OVERRIDES += \