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

* commit '5f3af1449aa9a86768f7768c14eaeba927733c91':
  Fix touch-to-wake while dozing
This commit is contained in:
Jorim Jaggi
2015-08-13 01:18:24 +00:00
committed by Android Git Automerger

View File

@@ -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();
}