From bc9e070070b02a681a1423b8a8928ff08bb6c45e Mon Sep 17 00:00:00 2001
From: Kathy Chen <kxchen@google.com>
Date: Wed, 21 Dec 2022 12:40:53 -0800
Subject: [PATCH] Change ACCESS_AMBIENT_CONTEXT_EVENT permission protection
 level from "internal|role" to "signature|privileged|role". Add
 ACCESS_AMBIENT_CONTEXT_EVENT to the privapp-permissions allowlist for shell
 and systemui.

Bug: 194238130
Test: build in master and flash to device
Change-Id: I439e337515632b43f4c20d2fe4d1274b347a0bb1
---
 core/res/AndroidManifest.xml              | 2 +-
 data/etc/com.android.systemui.xml         | 1 +
 data/etc/privapp-permissions-platform.xml | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 3fdd6c4444c24..81b3af0e0e60e 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -6907,7 +6907,7 @@
          @hide
     -->
     <permission android:name="android.permission.ACCESS_AMBIENT_CONTEXT_EVENT"
-                android:protectionLevel="internal|role"/>
+                android:protectionLevel="signature|privileged|role"/>
 
     <!-- @SystemApi Required by a AmbientContextEventDetectionService
          to ensure that only the service with this permission can bind to it.
diff --git a/data/etc/com.android.systemui.xml b/data/etc/com.android.systemui.xml
index fc199440e7827..0aad0a8e290db 100644
--- a/data/etc/com.android.systemui.xml
+++ b/data/etc/com.android.systemui.xml
@@ -83,5 +83,6 @@
         <permission name="android.permission.READ_SAFETY_CENTER_STATUS" />
         <permission name="android.permission.SET_UNRESTRICTED_KEEP_CLEAR_AREAS" />
         <permission name="android.permission.READ_SEARCH_INDEXABLES" />
+        <permission name="android.permission.ACCESS_AMBIENT_CONTEXT_EVENT"/>
     </privapp-permissions>
 </permissions>
diff --git a/data/etc/privapp-permissions-platform.xml b/data/etc/privapp-permissions-platform.xml
index 1070841b543e4..5040a8668ae69 100644
--- a/data/etc/privapp-permissions-platform.xml
+++ b/data/etc/privapp-permissions-platform.xml
@@ -500,6 +500,8 @@ applications that come with the platform
         <permission name="android.permission.MODIFY_CELL_BROADCASTS" />
         <!-- Permission required for CTS test - CtsBroadcastRadioTestCases -->
         <permission name="android.permission.ACCESS_BROADCAST_RADIO"/>
+        <!-- Permission required for CTS test - CtsAmbientContextServiceTestCases -->
+        <permission name="android.permission.ACCESS_AMBIENT_CONTEXT_EVENT"/>
     </privapp-permissions>
 
     <privapp-permissions package="com.android.statementservice">