diff options
| author | 2016-10-07 11:29:51 +0000 | |
|---|---|---|
| committer | 2016-10-07 11:29:51 +0000 | |
| commit | e6f8904cd108feedf015d55bc3d0b52f312a0903 (patch) | |
| tree | 4589dabe136c954bc68e9e6d3d0bc14992ddf52f | |
| parent | 0189359870d22a02eb99cb304a94113b62295105 (diff) | |
| parent | 05efd16c46c6f5c607f4604fb2cf48b4ea430382 (diff) | |
Merge "Make PIN/password failed attempts dialog non-cancelable" am: 708543b5ff am: d94cc68123
am: 05efd16c46
Change-Id: Ife64f5db81028f665101d434cd6345ed8dac2d7c
| -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 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)) { |