am 5fbd9950: am 76c234c8: am d0d23c80: Merge "Fix wrong states when waking up from doze via touch" into lmp-mr1-dev

* commit '5fbd9950e72e74b094b16a59045400ffdb432ad4': Fix wrong states when waking up from doze via touch
2014-11-14 00:44:02 +00:00
parent d65bd17af9 5fbd9950e7
commit 9c7ee0818b
1 changed files with 1 additions and 0 deletions
--- 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);
            }
        }
    }