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

Commit b3adb906 authored by Bernard Chau's avatar Bernard Chau
Browse files

Updated permission name according to API review 

Fix: 123661671
Test: N/A
Change-Id: Ia06c4ede8b9379e84a87454dbca8ba361a4f49b4
parent d9d6acf1

src/com/android/settings/password/SetNewPasswordActivity.java

+3 −3
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


package com.android.settings.password;



import static android.Manifest.permission.GET_AND_REQUEST_SCREEN_LOCK_COMPLEXITY;

import static android.Manifest.permission.REQUEST_SCREEN_LOCK_COMPLEXITY;

import static android.app.admin.DevicePolicyManager.ACTION_SET_NEW_PARENT_PROFILE_PASSWORD;

import static android.app.admin.DevicePolicyManager.ACTION_SET_NEW_PASSWORD;

import static android.app.admin.DevicePolicyManager.EXTRA_PASSWORD_COMPLEXITY;
@@ -83,7 +83,7 @@ public class SetNewPasswordActivity extends Activity implements SetNewPasswordCo 
        if (ACTION_SET_NEW_PASSWORD.equals(mNewPasswordAction)

                && getIntent().hasExtra(EXTRA_PASSWORD_COMPLEXITY)) {

            final boolean hasPermission = PasswordUtils.isCallingAppPermitted(

                    this, activityToken, GET_AND_REQUEST_SCREEN_LOCK_COMPLEXITY);

                    this, activityToken, REQUEST_SCREEN_LOCK_COMPLEXITY);

            if (hasPermission) {

                mRequestedMinComplexity =

                        PasswordMetrics.sanitizeComplexityLevel(getIntent()
@@ -91,7 +91,7 @@ public class SetNewPasswordActivity extends Activity implements SetNewPasswordCo 
            } else {

                PasswordUtils.crashCallingApplication(activityToken,

                        "Must have permission "

                                + GET_AND_REQUEST_SCREEN_LOCK_COMPLEXITY + " to use extra "

                                + REQUEST_SCREEN_LOCK_COMPLEXITY + " to use extra "

                                + EXTRA_PASSWORD_COMPLEXITY);

                finish();

                return;

src/com/android/settings/password/SetupChooseLockGeneric.java

+3 −3
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


package com.android.settings.password;



import static android.Manifest.permission.GET_AND_REQUEST_SCREEN_LOCK_COMPLEXITY;

import static android.Manifest.permission.REQUEST_SCREEN_LOCK_COMPLEXITY;

import static android.app.admin.DevicePolicyManager.EXTRA_PASSWORD_COMPLEXITY;



import static com.android.settings.password.ChooseLockSettingsHelper.EXTRA_KEY_REQUESTED_MIN_COMPLEXITY;
@@ -82,10 +82,10 @@ public class SetupChooseLockGeneric extends ChooseLockGeneric { 
        if(getIntent().hasExtra(EXTRA_KEY_REQUESTED_MIN_COMPLEXITY)) {

            IBinder activityToken = getActivityToken();

            boolean hasPermission = PasswordUtils.isCallingAppPermitted(

                    this, activityToken, GET_AND_REQUEST_SCREEN_LOCK_COMPLEXITY);

                    this, activityToken, REQUEST_SCREEN_LOCK_COMPLEXITY);

            if (!hasPermission) {

                PasswordUtils.crashCallingApplication(activityToken,

                        "Must have permission " + GET_AND_REQUEST_SCREEN_LOCK_COMPLEXITY

                        "Must have permission " + REQUEST_SCREEN_LOCK_COMPLEXITY

                                + " to use extra " + EXTRA_PASSWORD_COMPLEXITY);

                finish();

                return;

tests/robotests/src/com/android/settings/password/SetNewPasswordActivityTest.java

+7 −7
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


package com.android.settings.password;



import static android.Manifest.permission.GET_AND_REQUEST_SCREEN_LOCK_COMPLEXITY;

import static android.Manifest.permission.REQUEST_SCREEN_LOCK_COMPLEXITY;

import static android.app.admin.DevicePolicyManager.ACTION_SET_NEW_PARENT_PROFILE_PASSWORD;

import static android.app.admin.DevicePolicyManager.ACTION_SET_NEW_PASSWORD;

import static android.app.admin.DevicePolicyManager.EXTRA_PASSWORD_COMPLEXITY;
@@ -139,7 +139,7 @@ public class SetNewPasswordActivityTest { 
    public void testLaunchChooseLock_setNewPasswordExtraWithPermission() {

        ShadowPasswordUtils.setCallingAppLabel(APP_LABEL);

        ShadowPasswordUtils.setCallingAppPackageName(PKG_NAME);

        ShadowPasswordUtils.addGrantedPermission(GET_AND_REQUEST_SCREEN_LOCK_COMPLEXITY);

        ShadowPasswordUtils.addGrantedPermission(REQUEST_SCREEN_LOCK_COMPLEXITY);

        Settings.Global.putInt(RuntimeEnvironment.application.getContentResolver(),

                Settings.Global.DEVICE_PROVISIONED, 1);
@@ -169,7 +169,7 @@ public class SetNewPasswordActivityTest { 
    public void testLaunchChooseLock_setNewPasswordExtraInvalidValue() {

        ShadowPasswordUtils.setCallingAppLabel(APP_LABEL);

        ShadowPasswordUtils.setCallingAppPackageName(PKG_NAME);

        ShadowPasswordUtils.addGrantedPermission(GET_AND_REQUEST_SCREEN_LOCK_COMPLEXITY);

        ShadowPasswordUtils.addGrantedPermission(REQUEST_SCREEN_LOCK_COMPLEXITY);

        Settings.Global.putInt(RuntimeEnvironment.application.getContentResolver(),

                Settings.Global.DEVICE_PROVISIONED, 1);
@@ -197,7 +197,7 @@ public class SetNewPasswordActivityTest { 
    public void testLaunchChooseLock_setNewPasswordExtraNoneComplexity() {

        ShadowPasswordUtils.setCallingAppLabel(APP_LABEL);

        ShadowPasswordUtils.setCallingAppPackageName(PKG_NAME);

        ShadowPasswordUtils.addGrantedPermission(GET_AND_REQUEST_SCREEN_LOCK_COMPLEXITY);

        ShadowPasswordUtils.addGrantedPermission(REQUEST_SCREEN_LOCK_COMPLEXITY);

        Settings.Global.putInt(RuntimeEnvironment.application.getContentResolver(),

                Settings.Global.DEVICE_PROVISIONED, 1);
@@ -225,7 +225,7 @@ public class SetNewPasswordActivityTest { 
    public void testLaunchChooseLock_setNewPasswordWithoutExtra() {

        ShadowPasswordUtils.setCallingAppLabel(APP_LABEL);

        ShadowPasswordUtils.setCallingAppPackageName(PKG_NAME);

        ShadowPasswordUtils.addGrantedPermission(GET_AND_REQUEST_SCREEN_LOCK_COMPLEXITY);

        ShadowPasswordUtils.addGrantedPermission(REQUEST_SCREEN_LOCK_COMPLEXITY);

        Settings.Global.putInt(RuntimeEnvironment.application.getContentResolver(),

                Settings.Global.DEVICE_PROVISIONED, 1);
@@ -252,7 +252,7 @@ public class SetNewPasswordActivityTest { 
    public void testLaunchChooseLock_setNewParentProfilePasswordExtraWithPermission() {

        ShadowPasswordUtils.setCallingAppLabel(APP_LABEL);

        ShadowPasswordUtils.setCallingAppPackageName(PKG_NAME);

        ShadowPasswordUtils.addGrantedPermission(GET_AND_REQUEST_SCREEN_LOCK_COMPLEXITY);

        ShadowPasswordUtils.addGrantedPermission(REQUEST_SCREEN_LOCK_COMPLEXITY);

        Settings.Global.putInt(RuntimeEnvironment.application.getContentResolver(),

                Settings.Global.DEVICE_PROVISIONED, 1);
@@ -280,7 +280,7 @@ public class SetNewPasswordActivityTest { 
    public void testLaunchChooseLock_setNewParentProfilePasswordWithoutExtra() {

        ShadowPasswordUtils.setCallingAppLabel(APP_LABEL);

        ShadowPasswordUtils.setCallingAppPackageName(PKG_NAME);

        ShadowPasswordUtils.addGrantedPermission(GET_AND_REQUEST_SCREEN_LOCK_COMPLEXITY);

        ShadowPasswordUtils.addGrantedPermission(REQUEST_SCREEN_LOCK_COMPLEXITY);

        Settings.Global.putInt(RuntimeEnvironment.application.getContentResolver(),

                Settings.Global.DEVICE_PROVISIONED, 1);

tests/robotests/src/com/android/settings/password/SetupChooseLockGenericTest.java

+2 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


package com.android.settings.password;



import static android.Manifest.permission.GET_AND_REQUEST_SCREEN_LOCK_COMPLEXITY;

import static android.Manifest.permission.REQUEST_SCREEN_LOCK_COMPLEXITY;

import static android.app.admin.DevicePolicyManager.PASSWORD_COMPLEXITY_HIGH;



import static com.android.settings.password.ChooseLockSettingsHelper.EXTRA_KEY_REQUESTED_MIN_COMPLEXITY;
@@ -68,7 +68,7 @@ public class SetupChooseLockGenericTest { 
    @Test

    @Config(shadows = {ShadowPasswordUtils.class})

    public void setupChooseLockGenericPasswordComplexityExtraWithPermission() {

        ShadowPasswordUtils.addGrantedPermission(GET_AND_REQUEST_SCREEN_LOCK_COMPLEXITY);

        ShadowPasswordUtils.addGrantedPermission(REQUEST_SCREEN_LOCK_COMPLEXITY);



        Intent intent = new Intent("com.android.settings.SETUP_LOCK_SCREEN");

        intent.putExtra(EXTRA_KEY_REQUESTED_MIN_COMPLEXITY, PASSWORD_COMPLEXITY_HIGH);