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

Release doze wake lock when doze dream is stopped

Browse Source 
Before this CL, if the doze dream instance is replaced by another
dream instance, the doze lock was never released. There is a check
in the DreamManagerService#onDreamStopped path, that normally releases
the doze lock in a normal wake up. But when the doze dream instance
has been replaced by another dream instance, the doze dream token
doesn't match the current dream token, and so the doze wake lock is
never released. This causes the display to flicker right before
entering AOD (dozing).

This CL handles the case when a doze dream is replaced by a normal
dream and releases the doze lock whenever a doze dream instance is
stopped.

Bug: 260094933
Test: manual - check that the flickering disappeared
Change-Id: I3fdf10566ba57fadfa83a5d78038db68bf4a1150
This commit is contained in:
Galia Peycheva
2023-01-26 14:41:57 +00:00
parent 33211a4348
commit eeaba58c8a
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/dreams/DreamController.java
View File

@@ -281,7 +281,10 @@ final class DreamController {
new int[] {ACTIVITY_TYPE_DREAM});
mListener.onDreamStopped(dream.mToken);
} else if (dream.mCanDoze && !mCurrentDream.mCanDoze) {
mListener.stopDozing(dream.mToken);
}
} finally {
Trace.traceEnd(Trace.TRACE_TAG_POWER);
}
@@ -327,6 +330,7 @@ final class DreamController {
*/
public interface Listener {
void onDreamStopped(Binder token);
void stopDozing(Binder token);
}
private final class DreamRecord implements DeathRecipient, ServiceConnection {

12
services/core/java/com/android/server/dreams/DreamManagerService.java
View File

@@ -499,7 +499,12 @@ public final class DreamManagerService extends SystemService {
}
synchronized (mLock) {
if (mCurrentDream != null && mCurrentDream.token == token && mCurrentDream.isDozing) {
if (mCurrentDream == null) {
return;
}
final boolean sameDream = mCurrentDream.token == token;
if ((sameDream && mCurrentDream.isDozing) || (!sameDream && !mCurrentDream.isDozing)) {
mCurrentDream.isDozing = false;
mDozeWakeLock.release();
mPowerManagerInternal.setDozeOverrideFromDreamManager(
@@ -768,6 +773,11 @@ public final class DreamManagerService extends SystemService {
}
}
}
@Override
public void stopDozing(Binder token) {
stopDozingInternal(token);
}
};
private final ContentObserver mDozeEnabledObserver = new ContentObserver(null) {