am d59f5c02: am a78181b6: Merge "Fix touch-to-wake while dozing" into mnc-dr-dev

* commit 'd59f5c02810095bba4bc7a47f9169655d4be7521': Fix touch-to-wake while dozing
2015-08-13 01:09:26 +00:00
parent deb6a3acbd d59f5c0281
commit 5f3af1449a
1 changed files with 1 additions and 1 deletions
--- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
@@ -473,7 +473,7 @@ public class KeyguardViewMediator extends SystemUI {
                    mWakeAndUnlocking = true;
                    mStatusBarKeyguardViewManager.setWakeAndUnlocking();
                    keyguardDone(true);
-                } else if (mShowing && mDeviceInteractive) {
+                } else if (mShowing) {
                    if (wakeAndUnlocking) {
                        mStatusBarKeyguardViewManager.notifyDeviceWakeUpRequested();
                    }