From 2c526515775559b34a311400435de28d85b9c79e Mon Sep 17 00:00:00 2001 From: John Spurlock Date: Wed, 17 Sep 2014 12:55:17 -0400 Subject: [PATCH] Settings: Ensure CryptKeeper dismisses secure keyguards. Otherwise, the lockscreen can be shown during the decryption challenge, which hides the challenge activity window until the next reboot. Bug:17512377 Change-Id: Idb6b5b3dddb3cf2dc70b784413ea310c401880af --- src/com/android/settings/CryptKeeper.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/CryptKeeper.java b/src/com/android/settings/CryptKeeper.java index 90f9f54a1c..013fd3a78a 100644 --- a/src/com/android/settings/CryptKeeper.java +++ b/src/com/android/settings/CryptKeeper.java @@ -752,8 +752,9 @@ public class CryptKeeper extends Activity implements TextView.OnEditorActionList mHandler.removeMessages(MESSAGE_NOTIFY); mHandler.sendEmptyMessageDelayed(MESSAGE_NOTIFY, 120 * 1000); - // Dismiss keyguard while this screen is showing. - getWindow().addFlags(WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD); + // Dismiss secure & non-secure keyguards while this screen is showing. + getWindow().addFlags(WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD + | WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED); } /** -- 2.11.0