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

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

Merge "Create new permission SET_AND_VERIFY_LOCKSCREEN_CREDENTIALS" am: 71c50190 

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

Change-Id: I2bd05e7f6f7d5b4981ce47d94500aa723c06a2b6
parents 1a47316d 71c50190

core/api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,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 SET_AND_VERIFY_LOCKSCREEN_CREDENTIALS = "android.permission.SET_AND_VERIFY_LOCKSCREEN_CREDENTIALS";

    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
@@ -4595,6 +4595,11 @@ 
    <permission android:name="android.permission.SET_INITIAL_LOCK"

        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 -->

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

        android:protectionLevel="signature|privileged" />

packages/Shell/AndroidManifest.xml

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

    <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 -->

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

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