diff options
| author | Dianne Hackborn <hackbod@google.com> | 2015-07-15 17:11:05 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-15 17:11:12 +0000 |
| commit | 1d4247c4cc89c6d62e44ed3115f26579979b44b5 (patch) | |
| tree | f9be9919d682d7cad892dac45a82b270aa8275f5 /packages/SystemUI/src | |
| parent | facfbc52d863b11138d7c67087f9b6b0e81765f9 (diff) | |
| parent | 280a64e793d081847c5dcea23ed9be38aa5332d2 (diff) | |
| download | frameworks_base-1d4247c4cc89c6d62e44ed3115f26579979b44b5.zip frameworks_base-1d4247c4cc89c6d62e44ed3115f26579979b44b5.tar.gz frameworks_base-1d4247c4cc89c6d62e44ed3115f26579979b44b5.tar.bz2 | |
Merge "Improve tracking of screen on reasons." into mnc-dev
Diffstat (limited to 'packages/SystemUI/src')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java | 2 |
1 files changed, 1 insertions, 1 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 88aa071..1e78f66 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java @@ -3907,7 +3907,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, public void wakeUpIfDozing(long time, MotionEvent event) { if (mDozing && mDozeScrimController.isPulsing()) { PowerManager pm = (PowerManager) mContext.getSystemService(Context.POWER_SERVICE); - pm.wakeUp(time); + pm.wakeUp(time, "com.android.systemui:NODOZE"); mScreenOnComingFromTouch = true; mScreenOnTouchLocation = new PointF(event.getX(), event.getY()); mNotificationPanel.setTouchDisabled(false); |