diff options
author | Esteban Talavera <etalavera@google.com> | 2014-08-06 16:20:56 +0100 |
---|---|---|
committer | Esteban Talavera <etalavera@google.com> | 2014-08-06 18:10:16 +0100 |
commit | fe0f24cc92b04e03cac3f807859721f1ce7ef54a (patch) | |
tree | 1ef3bbf51014c4775a686bb2808978d60549ba0e /packages/Keyguard/src | |
parent | 3f1ddf83a4faba3dec71ed7eebe1835f4685cf60 (diff) | |
download | frameworks_base-fe0f24cc92b04e03cac3f807859721f1ce7ef54a.zip frameworks_base-fe0f24cc92b04e03cac3f807859721f1ce7ef54a.tar.gz frameworks_base-fe0f24cc92b04e03cac3f807859721f1ce7ef54a.tar.bz2 |
Wipe only managed profile when max number of incorrect passwords exceeded
When the maximum number of retries that has been exceeded is not for the primary profile of the user, wipe only the profile that set that policy (e.g. the managed profile) rather than the entire user. At the moment the whole device is wiped if the max number of incorrect passwords for a managed profile is reached, as the password is shared with the USER_OWNER.
Bug: 14453697
Change-Id: I5746de104133c0ea0a51d75b9c92e1516d365d8c
Diffstat (limited to 'packages/Keyguard/src')
-rw-r--r-- | packages/Keyguard/src/com/android/keyguard/KeyguardSecurityContainer.java | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardSecurityContainer.java b/packages/Keyguard/src/com/android/keyguard/KeyguardSecurityContainer.java index 7727e4a..724b560 100644 --- a/packages/Keyguard/src/com/android/keyguard/KeyguardSecurityContainer.java +++ b/packages/Keyguard/src/com/android/keyguard/KeyguardSecurityContainer.java @@ -57,7 +57,7 @@ public class KeyguardSecurityContainer extends FrameLayout implements KeyguardSe } public KeyguardSecurityContainer(Context context) { - this(null, null, 0); + this(context, null, 0); } public KeyguardSecurityContainer(Context context, AttributeSet attrs, int defStyle) { @@ -240,10 +240,13 @@ public class KeyguardSecurityContainer extends FrameLayout implements KeyguardSe boolean showTimeout = false; if (remainingBeforeWipe < LockPatternUtils.FAILED_ATTEMPTS_BEFORE_WIPE_GRACE) { - // If we reach this code, it means the user has installed a DevicePolicyManager - // that requests device wipe after N attempts. Once we get below the grace - // period, we'll post this dialog every time as a clear warning until the - // bombshell hits and the device is wiped. + // The user has installed a DevicePolicyManager that requests a user/profile to be wiped + // N attempts. Once we get below the grace period, we post this dialog every time as a + // clear warning until the deletion fires. + // + // TODO: Show a different dialog depending on whether the device will be completely + // wiped (i.e. policy is set for the primary profile of the USER_OWNER) or a single + // secondary user or managed profile will be removed. if (remainingBeforeWipe > 0) { showAlmostAtWipeDialog(failedAttempts, remainingBeforeWipe); } else { |