Only dismiss Keyguard with space when screen is on

Bug: 17206291 Change-Id: I7fd9c77a0810bb71c0e4193ab121398e8e78d43b
2014-08-29 16:28:20 +02:00
parent 1728879d9c
commit 2c33d5dcae
1 changed files with 2 additions and 1 deletions
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
@@ -3612,7 +3612,8 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
    }

    public boolean onSpacePressed() {
-        if (mState == StatusBarState.KEYGUARD || mState == StatusBarState.SHADE_LOCKED) {
+        if (mScreenOn != null && mScreenOn
+                && (mState == StatusBarState.KEYGUARD || mState == StatusBarState.SHADE_LOCKED)) {
            animateCollapsePanels(0 /* flags */, true /* force */);
            return true;
        }