PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '0f01eb7f1ad7939753633becfafc67f2446c9318':
  Settings: Ensure CryptKeeper dismisses secure keyguards.
This commit is contained in:
John Spurlock
2014-09-17 19:53:47 +00:00
committed by Android Git Automerger
parent 01de98321a 0f01eb7f1a
commit 7dfc3540a3
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/CryptKeeper.java
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);
}
/**