diff options
| author | Jim Miller <jaggies@google.com> | 2013-11-14 01:45:51 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-11-14 01:45:52 +0000 |
| commit | c8867b2807b6d7ffcd3c2f935d1fe8c857a9ef8d (patch) | |
| tree | 275dbcf547390ccd823f96e0272e5ab3e4e44f5d /packages | |
| parent | c32d89f63f5eb8b764e88dbe4c0bcefab330cfb2 (diff) | |
| parent | e5f17ab5a61a69aaa36b883a9abdeab9cba6c48e (diff) | |
| download | frameworks_base-c8867b2807b6d7ffcd3c2f935d1fe8c857a9ef8d.zip frameworks_base-c8867b2807b6d7ffcd3c2f935d1fe8c857a9ef8d.tar.gz frameworks_base-c8867b2807b6d7ffcd3c2f935d1fe8c857a9ef8d.tar.bz2 | |
Merge "Report keyguard as initially showing and secure until we know" into klp-dev
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/Keyguard/src/com/android/keyguard/KeyguardViewMediator.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardViewMediator.java b/packages/Keyguard/src/com/android/keyguard/KeyguardViewMediator.java index 49982ea..b65fcd8 100644 --- a/packages/Keyguard/src/com/android/keyguard/KeyguardViewMediator.java +++ b/packages/Keyguard/src/com/android/keyguard/KeyguardViewMediator.java @@ -200,7 +200,7 @@ public class KeyguardViewMediator { // cached value of whether we are showing (need to know this to quickly // answer whether the input should be restricted) - private boolean mShowing = false; + private boolean mShowing; // true if the keyguard is hidden by another window private boolean mHidden = false; @@ -508,6 +508,9 @@ public class KeyguardViewMediator { ? lockPatternUtils : new LockPatternUtils(mContext); mLockPatternUtils.setCurrentUser(UserHandle.USER_OWNER); + // Assume keyguard is showing (unless it's disabled) until we know for sure... + mShowing = !mLockPatternUtils.isLockScreenDisabled(); + WindowManager wm = (WindowManager)context.getSystemService(Context.WINDOW_SERVICE); mKeyguardViewManager = new KeyguardViewManager(context, wm, mViewMediatorCallback, |