commit 31dafe77922fc7bc17dff93a5b2208a8ac554652
author arangelov <arangelov@google.com> Fri Jan 07 14:29:30 2022 +0000
committer arangelov <arangelov@google.com> Fri Jan 07 14:36:48 2022 +0000
tree d1fbe9659e2b138432d537c19cffcf076c84cd1f
parent 5091adef7f535fe69fba9752730b32a4c4b9df76

Make LAUNCH_DEVICE_MANAGER_SETUP adoptable by shell for CTS tests

Fixes: 213574164
Test: none
Ignore-AOSP-First: This new permission is part of a T-targeting feature
Change-Id: I9deebbb9721232ba29cbc5a8267a240761a2bc82

data/etc/privapp-permissions-platform.xml

diff --git a/data/etc/privapp-permissions-platform.xml b/data/etc/privapp-permissions-platform.xml
index f83f401..d534e61 100644
--- a/data/etc/privapp-permissions-platform.xml
+++ b/data/etc/privapp-permissions-platform.xml
@@ -292,6 +292,7 @@
 
     <privapp-permissions package="com.android.shell">
         <!-- Needed for test only -->
+        <permission name="android.permission.LAUNCH_DEVICE_MANAGER_SETUP"/>
         <permission name="android.permission.MODIFY_DAY_NIGHT_MODE"/>
         <permission name="android.permission.ACCESS_LOWPAN_STATE"/>
         <permission name="android.permission.BACKUP"/>

packages/Shell/AndroidManifest.xml

diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml
index 2b311ee..8649b5a 100644
--- a/packages/Shell/AndroidManifest.xml
+++ b/packages/Shell/AndroidManifest.xml
@@ -23,6 +23,7 @@
         >
 
         <!-- Standard permissions granted to the shell. -->
+    <uses-permission android:name="android.permission.LAUNCH_DEVICE_MANAGER_SETUP" />
     <uses-permission android:name="android.permission.GET_RUNTIME_PERMISSIONS" />
     <uses-permission android:name="android.permission.SEND_SMS" />
     <uses-permission android:name="android.permission.READ_SMS" />