Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Cannot determine Doze state during transition" into sc-dev

Browse Source
This commit is contained in:
Beverly Tai
2021-03-29 14:34:15 +00:00
committed by Android (Google) Code Review
parent 2b5b144ed0 7d0917fb2d
commit 18f543c54d
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/SystemUI/src/com/android/systemui/doze/DozeTriggers.java
View File

@@ -531,9 +531,13 @@ public class DozeTriggers implements DozeMachine.Part {
Assert.isMainThread();
mDozeHost.extendPulse(reason);
// we can't determine the dozing state if we're currently transitioning
final DozeMachine.State dozeState =
mMachine.isExecutingTransition() ? null : mMachine.getState();
// When already pulsing we're allowed to show the wallpaper directly without
// requesting a new pulse.
if (mMachine.getState() == DozeMachine.State.DOZE_PULSING
if (dozeState == DozeMachine.State.DOZE_PULSING
&& reason == DozeLog.PULSE_REASON_SENSOR_WAKE_LOCK_SCREEN) {
mMachine.requestState(DozeMachine.State.DOZE_PULSING_BRIGHT);
return;
@@ -541,8 +545,7 @@ public class DozeTriggers implements DozeMachine.Part {
if (mPulsePending || !mAllowPulseTriggers || !canPulse()) {
if (mAllowPulseTriggers) {
mDozeLog.tracePulseDropped(mPulsePending, mMachine.getState(),
mDozeHost.isPulsingBlocked());
mDozeLog.tracePulseDropped(mPulsePending, dozeState, mDozeHost.isPulsingBlocked());
}
runIfNotNull(onPulseSuppressedListener);
return;