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

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

Merge "Create new permission SET_AND_VERIFY_LOCKSCREEN_CREDENTIALS" into sc-dev am: 5ee5b490 

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

Change-Id: If0863ad38ff51102da580418fdc85dde7e4b7e98
parents ee1572af 5ee5b490

core/api/test-current.txt

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

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

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

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

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

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

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

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

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

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

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

core/res/AndroidManifest.xml

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

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

        android:protectionLevel="signature|setup"/>

        android:protectionLevel="signature|setup"/>





    <!-- @TestApi Allows applications to set and verify lockscreen credentials.

        @hide -->

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

                android:protectionLevel="signature"/>



    <!-- Allows managing (adding, removing) fingerprint templates. Reserved for the system. @hide -->

    <!-- Allows managing (adding, removing) fingerprint templates. Reserved for the system. @hide -->

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

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

        android:protectionLevel="signature|privileged" />

        android:protectionLevel="signature|privileged" />

packages/Shell/AndroidManifest.xml

+3 −0
Original line number Original line Diff line number Diff line
@@ -240,6 +240,9 @@ 
    <!-- Permission needed to run keyguard manager tests in CTS -->

    <!-- Permission needed to run keyguard manager tests in CTS -->

    <uses-permission android:name="android.permission.CONTROL_KEYGUARD_SECURE_NOTIFICATIONS" />

    <uses-permission android:name="android.permission.CONTROL_KEYGUARD_SECURE_NOTIFICATIONS" />





    <!-- Permission needed to set/clear/verify lockscreen credentials in CTS tests -->

    <uses-permission android:name="android.permission.SET_AND_VERIFY_LOCKSCREEN_CREDENTIALS" />



    <!-- Permission needed to test wallpaper component -->

    <!-- Permission needed to test wallpaper component -->

    <uses-permission android:name="android.permission.SET_WALLPAPER" />

    <uses-permission android:name="android.permission.SET_WALLPAPER" />

    <uses-permission android:name="android.permission.SET_WALLPAPER_COMPONENT" />

    <uses-permission android:name="android.permission.SET_WALLPAPER_COMPONENT" />