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
This commit is contained in:
John Spurlock
2014-09-17 12:55:17 -04:00
parent 27d74fa288
commit 2c52651577

View File

@@ -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);
}
/**