diff options
| author | Edward Savage-Jones <edward.savage-jones@sonymobile.com> | 2016-10-08 21:21:51 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-10-08 21:21:51 +0000 |
| commit | 8d6f73f6443c9729a7a7b0f645d8f41077af4af7 (patch) | |
| tree | 13e2f2c56b6f1c4531a1792ec441c71be1e38a88 /packages/Keyguard | |
| parent | d64d4c33f65702008d8b90f253b2f8f5883bca8b (diff) | |
| parent | e6f8904cd108feedf015d55bc3d0b52f312a0903 (diff) | |
Merge "Make PIN/password failed attempts dialog non-cancelable" am: 708543b5ff am: d94cc68123 am: 05efd16c46
am: e6f8904cd1
Change-Id: I99478a82c9b9db6147836e6e3ad053f2d767f9a7
Diffstat (limited to 'packages/Keyguard')
| -rw-r--r-- | packages/Keyguard/src/com/android/keyguard/KeyguardSecurityContainer.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardSecurityContainer.java b/packages/Keyguard/src/com/android/keyguard/KeyguardSecurityContainer.java index 04f32a1efdd8..91c943de756c 100644 --- a/packages/Keyguard/src/com/android/keyguard/KeyguardSecurityContainer.java +++ b/packages/Keyguard/src/com/android/keyguard/KeyguardSecurityContainer.java @@ -174,6 +174,7 @@ public class KeyguardSecurityContainer extends FrameLayout implements KeyguardSe final AlertDialog dialog = new AlertDialog.Builder(mContext) .setTitle(title) .setMessage(message) + .setCancelable(false) .setNeutralButton(R.string.ok, null) .create(); if (!(mContext instanceof Activity)) { |