commit 315c230cbb4fccbb13cfb8799247427d4dc08368
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Apr 03 21:23:35 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 03 21:23:35 2018 +0000
tree a31995746799527b0deb5bd52ce71b9b685fb305
parent a43cedbf25d3fd25c591fd1c6a1ae8c117f49bc3
parent e03081f4b7cf00dc58f1be24ae293583f8d738b2

Merge "Longer wake lock timeout" into pi-dev

packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java
index 2c025b5..28f3162 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java
@@ -807,7 +807,7 @@
     @VisibleForTesting
     protected WakeLock createWakeLock() {
          return new DelayedWakeLock(getHandler(),
-                WakeLock.createPartial(mContext, "Doze"));
+                WakeLock.createPartial(mContext, "Scrims"));
     }
 
     @Override

packages/SystemUI/src/com/android/systemui/util/wakelock/DelayedWakeLock.java

diff --git a/packages/SystemUI/src/com/android/systemui/util/wakelock/DelayedWakeLock.java b/packages/SystemUI/src/com/android/systemui/util/wakelock/DelayedWakeLock.java
index 5ec3dff..e1814098 100644
--- a/packages/SystemUI/src/com/android/systemui/util/wakelock/DelayedWakeLock.java
+++ b/packages/SystemUI/src/com/android/systemui/util/wakelock/DelayedWakeLock.java
@@ -23,7 +23,7 @@
  */
 public class DelayedWakeLock implements WakeLock {
 
-    private static final long RELEASE_DELAY_MS = 120;
+    private static final long RELEASE_DELAY_MS = 240;
 
     private final Handler mHandler;
     private final WakeLock mInner;