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

Commit 66e740d5 authored by Varun Shah's avatar Varun Shah Committed by android-build-merger
Browse files

Merge "Add TestApi to SUSPEND_APPS permission for GTS test." into qt-dev am: f2f148a5 

am: 1173945b

Change-Id: I9cd12f6711cd9167878d74a41ffa8745c9d7b30a
parents eef618bb 1173945b

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 MANAGE_ROLLBACKS = "android.permission.MANAGE_ROLLBACKS";

    field public static final String READ_CELL_BROADCASTS = "android.permission.READ_CELL_BROADCASTS";

    field public static final String REMOVE_TASKS = "android.permission.REMOVE_TASKS";

    field public static final String SUSPEND_APPS = "android.permission.SUSPEND_APPS";

    field public static final String TEST_MANAGE_ROLLBACKS = "android.permission.TEST_MANAGE_ROLLBACKS";

    field public static final String WRITE_DEVICE_CONFIG = "android.permission.WRITE_DEVICE_CONFIG";

    field public static final String WRITE_MEDIA_STORAGE = "android.permission.WRITE_MEDIA_STORAGE";

core/res/AndroidManifest.xml

+2 −2
Original line number Diff line number Diff line
@@ -1637,8 +1637,8 @@ 
        android:label="@string/permlab_bluetooth"

        android:protectionLevel="normal" />



    <!-- @SystemApi Allows an application to suspend other apps, which will prevent the user

         from using them until they are unsuspended.

    <!-- @SystemApi @TestApi Allows an application to suspend other apps, which will prevent the

         user from using them until they are unsuspended.

         @hide

    -->

    <permission android:name="android.permission.SUSPEND_APPS"