From 24b42e8e967b567744059bd5266297aeea261ffd Mon Sep 17 00:00:00 2001
From: Kurt Dresner <kdresner@google.com>
Date: Fri, 17 Sep 2021 20:36:54 +0000
Subject: [PATCH] Change TOGGLE_AUTOMOTIVE_PROJECTION from signature|privileged
 to internal|role.

Bug: 172251305
Change-Id: Ifd61339c78828357b9fd8b1d1f93b9f8ca578bb5
---
 core/res/AndroidManifest.xml              | 4 +---
 data/etc/privapp-permissions-platform.xml | 2 --
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index e655fab248a1f..9586e7e2256fb 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -2949,13 +2949,11 @@
                 android:protectionLevel="signature" />
 
     <!-- Allows an app to set and release automotive projection.
-         <p>Once permissions can be granted via role-only, this needs to be changed to
-          protectionLevel="role" and added to the SYSTEM_AUTOMOTIVE_PROJECTION role.
          @hide
          @SystemApi
     -->
     <permission android:name="android.permission.TOGGLE_AUTOMOTIVE_PROJECTION"
-                android:protectionLevel="signature|privileged" />
+                android:protectionLevel="internal|role" />
 
     <!-- Allows an app to prevent non-system-overlay windows from being drawn on top of it -->
     <permission android:name="android.permission.HIDE_OVERLAY_WINDOWS"
diff --git a/data/etc/privapp-permissions-platform.xml b/data/etc/privapp-permissions-platform.xml
index 07389b26bc644..c2500395cc0cc 100644
--- a/data/etc/privapp-permissions-platform.xml
+++ b/data/etc/privapp-permissions-platform.xml
@@ -374,8 +374,6 @@ applications that come with the platform
         <permission name="android.permission.STOP_APP_SWITCHES"/>
         <permission name="android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME"/>
         <permission name="android.permission.SUSPEND_APPS" />
-        <!-- Permission required for UiModeManager and Telecom car mode CTS tests -->
-        <permission name="android.permission.TOGGLE_AUTOMOTIVE_PROJECTION" />
         <permission name="android.permission.UPDATE_APP_OPS_STATS"/>
         <permission name="android.permission.USE_RESERVED_DISK"/>
         <permission name="android.permission.UWB_PRIVILEGED"/>