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

Commit d714138d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add new screen lock complexity permission"

parents e19c4946 58053152

api/current.txt

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

    field public static final java.lang.String GET_ACCOUNTS = "android.permission.GET_ACCOUNTS";

    field public static final java.lang.String GET_ACCOUNTS_PRIVILEGED = "android.permission.GET_ACCOUNTS_PRIVILEGED";

    field public static final java.lang.String GET_AND_REQUEST_SCREEN_LOCK_COMPLEXITY = "android.permission.GET_AND_REQUEST_SCREEN_LOCK_COMPLEXITY";

    field public static final java.lang.String GET_PACKAGE_SIZE = "android.permission.GET_PACKAGE_SIZE";

    field public static final deprecated java.lang.String GET_TASKS = "android.permission.GET_TASKS";

    field public static final java.lang.String GLOBAL_SEARCH = "android.permission.GLOBAL_SEARCH";

core/res/AndroidManifest.xml

+9 −0
Original line number Diff line number Diff line
@@ -2127,6 +2127,15 @@ 
        android:label="@string/permlab_disableKeyguard"

        android:protectionLevel="normal" />



    <!-- Allows an application to get the screen lock complexity and prompt users to update the

     screen lock to a certain complexity level.

     <p>Protection level: normal

    -->

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

                android:label="@string/permlab_getAndRequestScreenLockComplexity"

                android:description="@string/permdesc_getAndRequestScreenLockComplexity"

                android:protectionLevel="normal" />



    <!-- ================================== -->

    <!-- Permissions to access other installed applications  -->

    <!-- ================================== -->

core/res/res/values/strings.xml

+10 −0
Original line number Diff line number Diff line
@@ -1396,6 +1396,16 @@ 
      disables the keylock when receiving an incoming phone call, then

      re-enables the keylock when the call is finished.</string>



    <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR_LIMIT=NONE] -->

    <string name="permlab_getAndRequestScreenLockComplexity">get and request screen lock complexity</string>

    <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR_LIMIT=NONE] -->

    <string name="permdesc_getAndRequestScreenLockComplexity">Allows the app to learn the screen

        lock complexity level (high, medium, low or none), which indicates the possible range of

        length and type of the screen lock. The app can also suggest to users that they update the

        screen lock to a certain level but users can freely ignore and navigate away. Note that the

        screen lock is not stored in plaintext so the app does not know the exact password.

    </string>



    <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR_LIMIT=NONE] -->

    <string name="permlab_useBiometric">use biometric hardware</string>

    <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this.[CHAR_LIMIT=NONE] -->