Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 434b4acb: am 90fa5331: Merge "Don\'t show keyguard until the device has been provisioned." into klp-dev

Browse Source 
* commit '434b4acb997484e7a540bf44bebd6b17c63fe270':
  Don't show keyguard until the device has been provisioned.
This commit is contained in:
Jim Miller
2013-11-14 15:44:51 -08:00
committed by Android Git Automerger
parent a5acd62bde 434b4acb99
commit dab5ba58fe
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/Keyguard/src/com/android/keyguard/KeyguardViewMediator.java
View File

@@ -509,7 +509,8 @@ public class KeyguardViewMediator {
mLockPatternUtils.setCurrentUser(UserHandle.USER_OWNER); mLockPatternUtils.setCurrentUser(UserHandle.USER_OWNER);
// Assume keyguard is showing (unless it's disabled) until we know for sure... // Assume keyguard is showing (unless it's disabled) until we know for sure...
mShowing = !mLockPatternUtils.isLockScreenDisabled(); mShowing = (mUpdateMonitor.isDeviceProvisioned() || mLockPatternUtils.isSecure())
&& !mLockPatternUtils.isLockScreenDisabled();
WindowManager wm = (WindowManager)context.getSystemService(Context.WINDOW_SERVICE); WindowManager wm = (WindowManager)context.getSystemService(Context.WINDOW_SERVICE);