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

Commit 2aa0647f authored by Sergey Nikolaienkov's avatar Sergey Nikolaienkov Committed by Android (Google) Code Review
Browse files

Merge "Add permission for CTS UnsupportedErrorDialogTests"

parents 9c9fb887 14ab28f2

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ package android { 
    field public static final String READ_CELL_BROADCASTS = "android.permission.READ_CELL_BROADCASTS";

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

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

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

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

core/res/AndroidManifest.xml

+5 −0
Original line number Diff line number Diff line
@@ -5034,6 +5034,11 @@ 
    <permission android:name="android.permission.ACCESS_LOCUS_ID_USAGE_STATS"

                android:protectionLevel="signature|appPredictor" />



    <!-- @hide @TestApi Allows apps to reset the state of {@link com.android.server.am.AppErrors}.

         <p>CTS tests will use UiAutomation.adoptShellPermissionIdentity() to gain access.  -->

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

        android:protectionLevel="signature" />



    <!-- Attribution for Geofencing service. -->

    <attribution android:tag="GeofencingService" android:label="@string/geofencing_service"/>

    <!-- Attribution for Country Detector. -->