From 0af09e0dc83251b5f66b6950b74356a01abcd0f0 Mon Sep 17 00:00:00 2001
From: Chi Zhang <czhangsd@google.com>
Date: Wed, 14 Jun 2023 18:18:47 -0700
Subject: [PATCH 1/2] Fix OobConfig permission for zuma.

Bug: 286117997
Test: build and manual test
Change-Id: I51f3a63b337ea555cc52ba71d776f5d0993409fd
---
 default-permissions.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/default-permissions.xml b/default-permissions.xml
index 49ae87b4..a2a75849 100644
--- a/default-permissions.xml
+++ b/default-permissions.xml
@@ -128,5 +128,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 3e3eecbbeca2c44e8be7751f86dc644695ab1695 Mon Sep 17 00:00:00 2001
From: Jack Wu <wjack@google.com>
Date: Thu, 15 Jun 2023 16:34:24 +0800
Subject: [PATCH 2/2] Set current date as activation date after device being
 provisioned

allow setting it when the device is unlocked.

Bug: 286767821
Test: set the date of first usage successfully
Change-Id: I2c4d21662e88a9d8d2b857547d12825575a81331
Signed-off-by: Jack Wu <wjack@google.com>
---
 conf/init.zuma.rc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/init.zuma.rc b/conf/init.zuma.rc
index e303dcca..f9550063 100644
--- a/conf/init.zuma.rc
+++ b/conf/init.zuma.rc
@@ -863,7 +863,7 @@ on property:sys.boot_completed=1
     # Enable SICD
     write /sys/devices/system/cpu/cpupm/cpupm/sicd 1
 
-on property:sys.boot_completed=1 && property:persist.sys.device_provisioned=1 && property:ro.boot.flash.locked=1
+on property:sys.boot_completed=1 && property:persist.sys.device_provisioned=1
     write /sys/class/power_supply/battery/first_usage_date 0
 
 # IMS WiFi Calling