Merge "Correctly forwarding the screen off event on lockscreen" into lmp-dev

2014-09-03 14:49:21 +00:00
parent 7632a807f7 7ff6eb6429
commit f6478d4c0a
1 changed files with 2 additions and 1 deletions
--- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
@@ -581,6 +581,8 @@ public class KeyguardViewMediator extends SystemUI {
            final boolean lockImmediately =
                mLockPatternUtils.getPowerButtonInstantlyLocks() || !mLockPatternUtils.isSecure();

+            notifyScreenOffLocked();
+
            if (mExitSecureCallback != null) {
                if (DEBUG) Log.d(TAG, "pending exit secure callback cancelled");
                try {
@@ -593,7 +595,6 @@ public class KeyguardViewMediator extends SystemUI {
                    hideLocked();
                }
            } else if (mShowing) {
-                notifyScreenOffLocked();
                resetStateLocked();
            } else if (why == WindowManagerPolicy.OFF_BECAUSE_OF_TIMEOUT
                   || (why == WindowManagerPolicy.OFF_BECAUSE_OF_USER && !lockImmediately)) {