diff options
| author | 2021-04-29 10:03:44 +0000 | |
|---|---|---|
| committer | 2021-04-29 10:03:44 +0000 | |
| commit | d4f1cb46f3b5e847626219121df0064bee74a49c (patch) | |
| tree | 6d2f85a0f3b9cbc24df566befd28d5c5f9681e71 | |
| parent | bbf4c3c2ce0bfba068362ec3201bf64fe39568b6 (diff) | |
| parent | bc7a72187d40a61dc5dad680e360d2a23c42950a (diff) | |
Merge "Add a new permission to install testOnly apps" am: 71d89f5d0d am: bc7a72187d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1689746
Change-Id: Iddb8ddbd27e4a21dbd34420501797c190480d45a
| -rw-r--r-- | core/api/test-current.txt | 1 | ||||
| -rw-r--r-- | core/res/AndroidManifest.xml | 7 | ||||
| -rw-r--r-- | packages/Shell/AndroidManifest.xml | 1 |
3 files changed, 9 insertions, 0 deletions
diff --git a/core/api/test-current.txt b/core/api/test-current.txt index e8f8f3a1c29d..e2975ad85ff8 100644 --- a/core/api/test-current.txt +++ b/core/api/test-current.txt @@ -14,6 +14,7 @@ package android { field public static final String CONTROL_DEVICE_LIGHTS = "android.permission.CONTROL_DEVICE_LIGHTS"; field public static final String FORCE_DEVICE_POLICY_MANAGER_LOGS = "android.permission.FORCE_DEVICE_POLICY_MANAGER_LOGS"; field public static final String FORCE_STOP_PACKAGES = "android.permission.FORCE_STOP_PACKAGES"; + field public static final String INSTALL_TEST_ONLY_PACKAGE = "android.permission.INSTALL_TEST_ONLY_PACKAGE"; field public static final String KEEP_UNINSTALLED_PACKAGES = "android.permission.KEEP_UNINSTALLED_PACKAGES"; field public static final String MANAGE_ACTIVITY_STACKS = "android.permission.MANAGE_ACTIVITY_STACKS"; field public static final String MANAGE_CRATES = "android.permission.MANAGE_CRATES"; diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index f96671560604..4f14909def2a 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -3800,6 +3800,13 @@ <permission android:name="com.android.permission.USE_INSTALLER_V2" android:protectionLevel="signature|verifier" /> + <!-- @TestApi Allows a testOnly application to get installed. + <p>Not for use by third-party applications. + @hide + --> + <permission android:name="android.permission.INSTALL_TEST_ONLY_PACKAGE" + android:protectionLevel="signature" /> + <!-- @SystemApi @TestApi Allows an application to clear user data. <p>Not for use by third-party applications @hide diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml index 4a64d6b2ff95..27df92f0832b 100644 --- a/packages/Shell/AndroidManifest.xml +++ b/packages/Shell/AndroidManifest.xml @@ -155,6 +155,7 @@ <uses-permission android:name="android.permission.INSTALL_PACKAGES" /> <!-- TODO(b/152310230): remove once APIs are confirmed to be sufficient --> <uses-permission android:name="com.android.permission.USE_INSTALLER_V2" /> + <uses-permission android:name="android.permission.INSTALL_TEST_ONLY_PACKAGE" /> <uses-permission android:name="android.permission.MOVE_PACKAGE" /> <uses-permission android:name="android.permission.KEEP_UNINSTALLED_PACKAGES" /> <uses-permission android:name="android.permission.CLEAR_APP_USER_DATA" /> |