From ab270a8cdccbfa6e3a40c09979b1491e020f9552 Mon Sep 17 00:00:00 2001
From: Meng Wang <mewan@google.com>
Date: Fri, 10 Dec 2021 21:28:32 +0000
Subject: [PATCH 1/2] Revert "pregrant coarse and background location
 permission to scone"

Revert "pregrant coarse and background location permission to scone"

Revert "pregrant coarse and background location permission to scone"

Revert submission 15820535-cherrypick-repregrantLocationToScone-5hvcs25t6g

Reason for revert: Unintended location usage issue not fixed.
Reverted Changes:
I1c2209112:pregrant coarse and background location permission...
I1b9370bdc:pregrant coarse and background location permission...
I0fbb20b3e:pregrant coarse and background location permission...
I2d4681b9a:pregrant coarse and background location permission...

Bug: 210152490
Change-Id: I8f4efa77b20656497999c3afaf4cb7e09081ed8d
---
 default-permissions.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/default-permissions.xml b/default-permissions.xml
index e87fc78a..12b40378 100644
--- a/default-permissions.xml
+++ b/default-permissions.xml
@@ -62,9 +62,6 @@
     </exception>
 
     <exception package="com.google.android.apps.scone">
-        <!-- Location access to determine proximity to a CBRS network coverage area -->
-        <permission name="android.permission.ACCESS_COARSE_LOCATION" fixed="false"/>
-        <permission name="android.permission.ACCESS_BACKGROUND_LOCATION" fixed="false"/>
         <!-- Used to call ActivityTransition API for Smart PNO -->
         <permission name="android.permission.ACTIVITY_RECOGNITION" fixed="false"/>
     </exception>

From fb6a6e6cbe32564cea0683c43817756655ec0e10 Mon Sep 17 00:00:00 2001
From: Stephane Lee <stayfan@google.com>
Date: Fri, 10 Dec 2021 14:50:45 -0800
Subject: [PATCH 2/2] Ensure aacr_state is writable for google battery

Bug: 205900652
Test: Ensure that there are no permissions denied errors for
google_battery

Change-Id: Icec73159f3686d37fcf91971772ec85d102b92fe
---
 conf/init.gs101.rc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/conf/init.gs101.rc b/conf/init.gs101.rc
index 1d0b341c..aae865eb 100644
--- a/conf/init.gs101.rc
+++ b/conf/init.gs101.rc
@@ -240,6 +240,7 @@ on init
     chown system system /sys/devices/platform/google,battery/power_supply/battery/bd_trickle_reset_sec
     chown system system /sys/devices/platform/google,battery/power_supply/battery/bd_clear
     chown system system /sys/devices/platform/google,battery/power_supply/battery/health_safety_margin
+    chown system system /sys/devices/platform/google,battery/power_supply/battery/aacr_state
     chown system system /sys/devices/platform/google,charger/bd_drainto_soc
     chown system system /sys/devices/platform/google,charger/bd_recharge_soc
     chown system system /sys/devices/platform/google,charger/bd_recharge_voltage