am ae9d437b: Merge "Settings: Ensure CryptKeeper dismisses secure keyguards." into lmp-dev

* commit 'ae9d437b4ab8dc98c347e4218390a38900979faa':
  Settings: Ensure CryptKeeper dismisses secure keyguards.
This commit is contained in:
John Spurlock
2014-09-17 19:48:26 +00:00
committed by Android Git Automerger

View File

@@ -752,8 +752,9 @@ public class CryptKeeper extends Activity implements TextView.OnEditorActionList
mHandler.removeMessages(MESSAGE_NOTIFY); mHandler.removeMessages(MESSAGE_NOTIFY);
mHandler.sendEmptyMessageDelayed(MESSAGE_NOTIFY, 120 * 1000); mHandler.sendEmptyMessageDelayed(MESSAGE_NOTIFY, 120 * 1000);
// Dismiss keyguard while this screen is showing. // Dismiss secure & non-secure keyguards while this screen is showing.
getWindow().addFlags(WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD); getWindow().addFlags(WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD
| WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED);
} }
/** /**