From 46ccd797acfa89d6df99cffacb3623c55df14a7d Mon Sep 17 00:00:00 2001 From: bernardchau Date: Mon, 11 Mar 2019 16:39:08 +0000 Subject: [PATCH] Update screen lock complexity permission to password complexity This is to match the method name "getPasswordComplexity" as requested by API review feedback Bug: 128030136 Test: N/A Change-Id: Ia4ce1b0ceb581608615364b41a05ca71142ef2b7 --- .../settings/password/SetNewPasswordActivity.java | 6 +++--- .../settings/password/SetupChooseLockGeneric.java | 6 +++--- .../password/SetNewPasswordActivityTest.java | 14 +++++++------- .../password/SetupChooseLockGenericTest.java | 4 ++-- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/com/android/settings/password/SetNewPasswordActivity.java b/src/com/android/settings/password/SetNewPasswordActivity.java index d7445e66dbe..4722c56c537 100644 --- a/src/com/android/settings/password/SetNewPasswordActivity.java +++ b/src/com/android/settings/password/SetNewPasswordActivity.java @@ -16,7 +16,7 @@ package com.android.settings.password; -import static android.Manifest.permission.REQUEST_SCREEN_LOCK_COMPLEXITY; +import static android.Manifest.permission.REQUEST_PASSWORD_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, REQUEST_SCREEN_LOCK_COMPLEXITY); + this, activityToken, REQUEST_PASSWORD_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 " - + REQUEST_SCREEN_LOCK_COMPLEXITY + " to use extra " + + REQUEST_PASSWORD_COMPLEXITY + " to use extra " + EXTRA_PASSWORD_COMPLEXITY); finish(); return; diff --git a/src/com/android/settings/password/SetupChooseLockGeneric.java b/src/com/android/settings/password/SetupChooseLockGeneric.java index 7fbb2114def..346e771d625 100644 --- a/src/com/android/settings/password/SetupChooseLockGeneric.java +++ b/src/com/android/settings/password/SetupChooseLockGeneric.java @@ -16,7 +16,7 @@ package com.android.settings.password; -import static android.Manifest.permission.REQUEST_SCREEN_LOCK_COMPLEXITY; +import static android.Manifest.permission.REQUEST_PASSWORD_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, REQUEST_SCREEN_LOCK_COMPLEXITY); + this, activityToken, REQUEST_PASSWORD_COMPLEXITY); if (!hasPermission) { PasswordUtils.crashCallingApplication(activityToken, - "Must have permission " + REQUEST_SCREEN_LOCK_COMPLEXITY + "Must have permission " + REQUEST_PASSWORD_COMPLEXITY + " to use extra " + EXTRA_PASSWORD_COMPLEXITY); finish(); return; diff --git a/tests/robotests/src/com/android/settings/password/SetNewPasswordActivityTest.java b/tests/robotests/src/com/android/settings/password/SetNewPasswordActivityTest.java index 48f9fb49fd7..bed09cb5d37 100644 --- a/tests/robotests/src/com/android/settings/password/SetNewPasswordActivityTest.java +++ b/tests/robotests/src/com/android/settings/password/SetNewPasswordActivityTest.java @@ -16,7 +16,7 @@ package com.android.settings.password; -import static android.Manifest.permission.REQUEST_SCREEN_LOCK_COMPLEXITY; +import static android.Manifest.permission.REQUEST_PASSWORD_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(REQUEST_SCREEN_LOCK_COMPLEXITY); + ShadowPasswordUtils.addGrantedPermission(REQUEST_PASSWORD_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(REQUEST_SCREEN_LOCK_COMPLEXITY); + ShadowPasswordUtils.addGrantedPermission(REQUEST_PASSWORD_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(REQUEST_SCREEN_LOCK_COMPLEXITY); + ShadowPasswordUtils.addGrantedPermission(REQUEST_PASSWORD_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(REQUEST_SCREEN_LOCK_COMPLEXITY); + ShadowPasswordUtils.addGrantedPermission(REQUEST_PASSWORD_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(REQUEST_SCREEN_LOCK_COMPLEXITY); + ShadowPasswordUtils.addGrantedPermission(REQUEST_PASSWORD_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(REQUEST_SCREEN_LOCK_COMPLEXITY); + ShadowPasswordUtils.addGrantedPermission(REQUEST_PASSWORD_COMPLEXITY); Settings.Global.putInt(RuntimeEnvironment.application.getContentResolver(), Settings.Global.DEVICE_PROVISIONED, 1); diff --git a/tests/robotests/src/com/android/settings/password/SetupChooseLockGenericTest.java b/tests/robotests/src/com/android/settings/password/SetupChooseLockGenericTest.java index d35b38ab5a9..cd79f58ee31 100644 --- a/tests/robotests/src/com/android/settings/password/SetupChooseLockGenericTest.java +++ b/tests/robotests/src/com/android/settings/password/SetupChooseLockGenericTest.java @@ -16,7 +16,7 @@ package com.android.settings.password; -import static android.Manifest.permission.REQUEST_SCREEN_LOCK_COMPLEXITY; +import static android.Manifest.permission.REQUEST_PASSWORD_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(REQUEST_SCREEN_LOCK_COMPLEXITY); + ShadowPasswordUtils.addGrantedPermission(REQUEST_PASSWORD_COMPLEXITY); Intent intent = new Intent("com.android.settings.SETUP_LOCK_SCREEN"); intent.putExtra(EXTRA_KEY_REQUESTED_MIN_COMPLEXITY, PASSWORD_COMPLEXITY_HIGH);