diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2017-08-25 03:32:44 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-08-25 03:32:44 +0000 |
| commit | 97bf71fcaf656e70b6b3f241976a9594cc1c3fa3 (patch) | |
| tree | 30adec2cbcced5fa28e346d1bfb2db87f8b3b3a7 | |
| parent | 43a0464518855ef8198301b2c2a46e362a937439 (diff) | |
| parent | 40cadad757944eb2f7ca48e90e4d676bbed78c41 (diff) | |
| download | base-97bf71fcaf656e70b6b3f241976a9594cc1c3fa3.tar.gz | |
Merge cherrypicks of [2793689, 2793690, 2790745, 2793230, 2792812, 2793231, 2790746, 2790747, 2793232] into oc-dr1-release
Change-Id: I7d8b15f94afc5d7ea09910a6ac2f51fecfb09f92
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java index 3d2213bf56e8..ada98b7a2ca3 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java @@ -5236,8 +5236,7 @@ public class StatusBar extends SystemUI implements DemoMode, private void maybePrepareWakeUpFromAod() { int wakefulness = mWakefulnessLifecycle.getWakefulness(); - if (mDozing && (wakefulness == WAKEFULNESS_WAKING - || wakefulness == WAKEFULNESS_ASLEEP) && !isPulsing()) { + if (mDozing && wakefulness == WAKEFULNESS_WAKING && !isPulsing()) { mScrimController.prepareWakeUpFromAod(); } } |