Merge "Make PIN/password failed attempts dialog non-cancelable" am: 708543b5ff am: d94cc68123

am: 05efd16c46 Change-Id: Ife64f5db81028f665101d434cd6345ed8dac2d7c
2016-10-07 11:29:51 +00:00
parent 0189359870 05efd16c46
commit e6f8904cd1
1 changed files with 1 additions and 0 deletions
--- 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)) {