Merge "Add INTERACT_ACROSS_PROFILES permission to shell for CTS test.…

…" into qt-dev
AOSP-10-CAF · May 21, 2019 · b92f077 · b92f077
2 parents 52819a1 + a248265
commit b92f077
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/data/etc/privapp-permissions-platform.xml b/data/etc/privapp-permissions-platform.xml
@@ -264,6 +264,8 @@ applications that come with the platform
         <permission name="android.permission.INSTALL_DYNAMIC_SYSTEM"/>
         <permission name="android.permission.INSTALL_LOCATION_PROVIDER"/>
         <permission name="android.permission.INSTALL_PACKAGES"/>
+        <!-- Needed for test only -->
+        <permission name="android.permission.INTERACT_ACROSS_PROFILES"/>
         <permission name="android.permission.INTERACT_ACROSS_USERS"/>
         <permission name="android.permission.LOCAL_MAC_ADDRESS"/>
         <permission name="android.permission.MANAGE_ACCESSIBILITY"/>

diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml
@@ -200,6 +200,9 @@
 
     <!-- Permission required to test ExplicitHealthCheckServiceImpl. -->
     <uses-permission android:name="android.permission.BIND_EXPLICIT_HEALTH_CHECK_SERVICE" />
+
+    <!-- Permission required for CTS test - CrossProfileAppsHostSideTest -->
+    <uses-permission android:name="android.permission.INTERACT_ACROSS_PROFILES"/>
 
     <application android:label="@string/app_label"
                  android:defaultToDeviceProtectedStorage="true"