diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-03-12 16:22:11 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-03-12 16:22:11 +0000 |
| commit | 794d22d0a7a02ada66e526bd56eac1170977eedb (patch) | |
| tree | 3e24ecf324e80a08d14621e47aebc9909269d705 /core/java | |
| parent | e0efb8b424b26c9bb94ace4026965906492b439d (diff) | |
| parent | 7ac9a71880ea3a09a4bce3cb9628d6b4c9be80b0 (diff) | |
Merge "Update screen lock complexity permission to password complexity"
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/app/admin/DevicePolicyManager.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index 8ee8f4399c5d..d82899eefda9 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -1377,7 +1377,7 @@ public class DevicePolicyManager { * complexity, and use this activity with extra {@link #EXTRA_PASSWORD_COMPLEXITY} to suggest * to users how complex the app wants the new screen lock to be. Note that both {@link * #getPasswordComplexity()} and the extra {@link #EXTRA_PASSWORD_COMPLEXITY} require the - * calling app to have the permission {@link permission#REQUEST_SCREEN_LOCK_COMPLEXITY}. + * calling app to have the permission {@link permission#REQUEST_PASSWORD_COMPLEXITY}. * * <p>If the intent is launched from within a managed profile with a profile * owner built against {@link android.os.Build.VERSION_CODES#M} or before, @@ -1405,7 +1405,7 @@ public class DevicePolicyManager { * * <p>If an invalid value is used, it will be treated as {@link #PASSWORD_COMPLEXITY_NONE}. */ - @RequiresPermission(android.Manifest.permission.REQUEST_SCREEN_LOCK_COMPLEXITY) + @RequiresPermission(android.Manifest.permission.REQUEST_PASSWORD_COMPLEXITY) public static final String EXTRA_PASSWORD_COMPLEXITY = "android.app.extra.PASSWORD_COMPLEXITY"; @@ -3398,10 +3398,10 @@ public class DevicePolicyManager { * * @throws IllegalStateException if the user is not unlocked. * @throws SecurityException if the calling application does not have the permission - * {@link permission#REQUEST_SCREEN_LOCK_COMPLEXITY} + * {@link permission#REQUEST_PASSWORD_COMPLEXITY} */ @PasswordComplexity - @RequiresPermission(android.Manifest.permission.REQUEST_SCREEN_LOCK_COMPLEXITY) + @RequiresPermission(android.Manifest.permission.REQUEST_PASSWORD_COMPLEXITY) public int getPasswordComplexity() { throwIfParentInstance("getPasswordComplexity"); if (mService == null) { |