summaryrefslogtreecommitdiffstats
path: root/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
diff options
context:
space:
mode:
authorJorim Jaggi <jjaggi@google.com>2014-11-11 23:16:28 +0100
committerJorim Jaggi <jjaggi@google.com>2014-11-13 17:09:29 +0100
commit68b83a784a0c9f3d2483a8a38b8e1ae047c4914e (patch)
tree54e45f799425551a373a617b5c61188c4483dc05 /packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
parentc61cabe5b3e22c8ebbb0ef91a33c63904ecb9873 (diff)
downloadframeworks_base-68b83a784a0c9f3d2483a8a38b8e1ae047c4914e.zip
frameworks_base-68b83a784a0c9f3d2483a8a38b8e1ae047c4914e.tar.gz
frameworks_base-68b83a784a0c9f3d2483a8a38b8e1ae047c4914e.tar.bz2
Fix wrong states when waking up from doze via touch
Bug: 18337222 Change-Id: I1cdc213a798ddac18b09accbbc31c59aa2a2d6fc
Diffstat (limited to 'packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java')
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
index 988534b..2f0ce28 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
@@ -4065,6 +4065,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
pm.wakeUp(time);
if (fromTouch) {
mScreenOnComingFromTouch = true;
+ mNotificationPanel.setTouchDisabled(false);
}
}
}