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

am: d94cc68123 Change-Id: I69df9317467dc48fdd0c39081fcd5a9e65d72cc1
2016-10-07 11:21:55 +00:00
parent 097ff24545 d94cc68123
commit 05efd16c46
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)) {