diff options
| author | Jim Miller <jaggies@google.com> | 2015-07-15 14:33:10 -0700 |
|---|---|---|
| committer | Jim Miller <jaggies@google.com> | 2015-07-15 14:33:10 -0700 |
| commit | c7b0435cc709c328da8e2b515ea04c8bc40d1094 (patch) | |
| tree | 042daa8ffa664abb32492f27ba95a27a3f70aea8 /packages/SystemUI/src | |
| parent | 2fc3216e2f8b77116594ca5cda2e927c43094039 (diff) | |
| parent | 1d4247c4cc89c6d62e44ed3115f26579979b44b5 (diff) | |
| download | frameworks_base-c7b0435cc709c328da8e2b515ea04c8bc40d1094.zip frameworks_base-c7b0435cc709c328da8e2b515ea04c8bc40d1094.tar.gz frameworks_base-c7b0435cc709c328da8e2b515ea04c8bc40d1094.tar.bz2 | |
resolved conflicts for merge of 1d4247c4 to mnc-dr-dev
Change-Id: I057c529dcd5d48e0dcf256a9d096c5d8b815892a
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 3ff9877..0a104ce 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); |