Merge "Update clock when turning the screen on" into qt-r1-dev

am: 68d625bea6

Change-Id: Ib27d0abb537fbba05bfa930628f1070f22ef2a72
This commit is contained in:
Lucas Dupin
2019-07-19 16:32:16 -07:00
committed by android-build-merger

View File

@@ -16,6 +16,7 @@
package com.android.systemui.doze; package com.android.systemui.doze;
import static com.android.systemui.doze.DozeMachine.State.DOZE;
import static com.android.systemui.doze.DozeMachine.State.DOZE_AOD_PAUSED; import static com.android.systemui.doze.DozeMachine.State.DOZE_AOD_PAUSED;
import android.app.AlarmManager; import android.app.AlarmManager;
@@ -116,7 +117,7 @@ public class DozeUi implements DozeMachine.Part {
public void transitionTo(DozeMachine.State oldState, DozeMachine.State newState) { public void transitionTo(DozeMachine.State oldState, DozeMachine.State newState) {
switch (newState) { switch (newState) {
case DOZE_AOD: case DOZE_AOD:
if (oldState == DOZE_AOD_PAUSED) { if (oldState == DOZE_AOD_PAUSED || oldState == DOZE) {
// Whenever turning on the display, it's necessary to push a new frame. // Whenever turning on the display, it's necessary to push a new frame.
// The display buffers will be empty and need to be filled. // The display buffers will be empty and need to be filled.
mHost.dozeTimeTick(); mHost.dozeTimeTick();