| commit | 8d6f73f6443c9729a7a7b0f645d8f41077af4af7 | [log] [tgz] |
|---|---|---|
| author | Edward Savage-Jones <edward.savage-jones@sonymobile.com> | Sat Oct 08 21:21:51 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Sat Oct 08 21:21:51 2016 +0000 |
| tree | 13e2f2c56b6f1c4531a1792ec441c71be1e38a88 | |
| 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
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardSecurityContainer.java b/packages/Keyguard/src/com/android/keyguard/KeyguardSecurityContainer.java index 04f32a1..91c943d 100644 --- a/packages/Keyguard/src/com/android/keyguard/KeyguardSecurityContainer.java +++ b/packages/Keyguard/src/com/android/keyguard/KeyguardSecurityContainer.java
@@ -174,6 +174,7 @@ final AlertDialog dialog = new AlertDialog.Builder(mContext) .setTitle(title) .setMessage(message) + .setCancelable(false) .setNeutralButton(R.string.ok, null) .create(); if (!(mContext instanceof Activity)) {