diff options
| author | Jim Miller <jaggies@google.com> | 2013-11-13 18:48:36 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-13 18:48:36 -0800 |
| commit | 35f5bdd16040a5d022f81856f3e3d6181d2e93cb (patch) | |
| tree | d941749e87e7b2d4f3185a7debd6bee597791285 /packages | |
| parent | a022c1933144e2406976cf23542606de8ba283ef (diff) | |
| parent | fdf7c36daaeec8c6ad7872f81e1f9c3faf1a0e91 (diff) | |
| download | frameworks_base-35f5bdd16040a5d022f81856f3e3d6181d2e93cb.zip frameworks_base-35f5bdd16040a5d022f81856f3e3d6181d2e93cb.tar.gz frameworks_base-35f5bdd16040a5d022f81856f3e3d6181d2e93cb.tar.bz2 | |
am fdf7c36d: am 378c804d: am c8867b28: Merge "Report keyguard as initially showing and secure until we know" into klp-dev
* commit 'fdf7c36daaeec8c6ad7872f81e1f9c3faf1a0e91':
Report keyguard as initially showing and secure until we know
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, |