summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorbernardchau <bernardchau@google.com>2019-03-11 16:37:44 +0000
committerbernardchau <bernardchau@google.com>2019-03-11 16:37:44 +0000
commit7ac9a71880ea3a09a4bce3cb9628d6b4c9be80b0 (patch)
tree9a15c32da6441a2a9166217f9bd3f514fad4b56f /core/java/android
parent8e97c35976e02c5dd4f1c5f84c1887b848d4fd1a (diff)
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: I999657f88ed425333adbe97b9ecc33da3769ba90
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/app/admin/DevicePolicyManager.java8
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 095d0147afd4..f9618dd103b9 100644
--- a/core/java/android/app/admin/DevicePolicyManager.java
+++ b/core/java/android/app/admin/DevicePolicyManager.java
@@ -1378,7 +1378,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,
@@ -1406,7 +1406,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";
@@ -3378,10 +3378,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) {