diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-05-21 16:58:38 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-05-21 16:58:38 +0000 |
| commit | b92f0771dc495402d0fcefb76e5eb2e47e8431d2 (patch) | |
| tree | 459feaaa582854c9dd40ae7ba6c65b33b0c7263f | |
| parent | 52819a13d3a4fb01c75378ee20819b6af37e3e60 (diff) | |
| parent | a248265d930a26090074050aad60da431c3a0257 (diff) | |
Merge "Add INTERACT_ACROSS_PROFILES permission to shell for CTS test." into qt-dev
| -rw-r--r-- | data/etc/privapp-permissions-platform.xml | 2 | ||||
| -rw-r--r-- | packages/Shell/AndroidManifest.xml | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/data/etc/privapp-permissions-platform.xml b/data/etc/privapp-permissions-platform.xml index ad99cce6132c..b3856d501c72 100644 --- 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 index aba88ab14387..e00f204945c1 100644 --- 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" |