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

Merge "Fix screen not turning off correctly." into sc-dev

Browse Source
This commit is contained in:
Sean Stout
2021-05-13 19:07:29 +00:00
committed by Android (Google) Code Review
parent 0d2041dec3 7b7621f5cd
commit 1d0ef86d51
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/power/PowerManagerService.java
View File

@@ -2957,8 +2957,7 @@ public final class PowerManagerService extends SystemService
// Group has been removed. // Group has been removed.
return; return;
} }
// TODO (b/175764708): Support per-display doze. wakefulness = mDisplayGroupPowerStateMapper.getWakefulnessLocked(groupId);
wakefulness = getWakefulnessLocked();
if ((wakefulness == WAKEFULNESS_DREAMING || wakefulness == WAKEFULNESS_DOZING) && if ((wakefulness == WAKEFULNESS_DREAMING || wakefulness == WAKEFULNESS_DOZING) &&
mDisplayGroupPowerStateMapper.isSandmanSummoned(groupId) mDisplayGroupPowerStateMapper.isSandmanSummoned(groupId)
&& mDisplayGroupPowerStateMapper.isReady(groupId)) { && mDisplayGroupPowerStateMapper.isReady(groupId)) {
@@ -3100,6 +3099,7 @@ public final class PowerManagerService extends SystemService
* Returns true if the device is allowed to doze in its current state. * Returns true if the device is allowed to doze in its current state.
*/ */
private boolean canDozeLocked() { private boolean canDozeLocked() {
// TODO (b/175764708): Support per-display doze.
return getWakefulnessLocked() == WAKEFULNESS_DOZING; return getWakefulnessLocked() == WAKEFULNESS_DOZING;
} }