summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Edward Savage-Jones <edward.savage-jones@sonymobile.com> 2016-10-07 11:17:49 +0000
committer android-build-merger <android-build-merger@google.com> 2016-10-07 11:17:49 +0000
commitd94cc681230cf437353d40c20cbe575feebb7037 (patch)
tree780e019e5bfb57d354f4d4213febb3bbf0f3d6e6
parent3c6b4961cb8092659c409dd9887a2d0543c040c1 (diff)
parent708543b5ffc01218dea70a25b6b7ee010de5d859 (diff)
Merge "Make PIN/password failed attempts dialog non-cancelable"
am: 708543b5ff Change-Id: I2a95bd2a53f3ef73f63b6d955528cb16dbd4de10
-rw-r--r--packages/Keyguard/src/com/android/keyguard/KeyguardSecurityContainer.java1
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 a7e4e1272a60..61e2fc095edb 100644
--- a/packages/Keyguard/src/com/android/keyguard/KeyguardSecurityContainer.java
+++ b/packages/Keyguard/src/com/android/keyguard/KeyguardSecurityContainer.java
@@ -173,6 +173,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)) {