Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bc7a7218 authored by Kholoud Mohamed's avatar Kholoud Mohamed Committed by Automerger Merge Worker
Browse files

Merge "Add a new permission to install testOnly apps" am: 71d89f5d 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1689746

Change-Id: I337626f46f9e44322c537ad2243dc0185f45b83e
parents 289a438f 71d89f5d

core/api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -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";

core/res/AndroidManifest.xml

+7 −0
Original line number Diff line number Diff line
@@ -3792,6 +3792,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

packages/Shell/AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -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" />