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

Merge "Add overlayfinishing state." into tm-qpr-dev am: 7c24fe78c8

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21336521

Change-Id: I9ad4d9225d121fd003021cf44cfabacc7e96f3be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Victor Truong
2023-02-10 17:11:21 +00:00
committed by Automerger Merge Worker
parent b5b3c5a1c8 7c24fe78c8
commit b4079321e9
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/service/dreams/DreamService.java
View File

@@ -234,6 +234,7 @@ public class DreamService extends Service implements Window.Callback {
private boolean mCanDoze; private boolean mCanDoze;
private boolean mDozing; private boolean mDozing;
private boolean mWindowless; private boolean mWindowless;
private boolean mOverlayFinishing;
private int mDozeScreenState = Display.STATE_UNKNOWN; private int mDozeScreenState = Display.STATE_UNKNOWN;
private int mDozeScreenBrightness = PowerManager.BRIGHTNESS_DEFAULT; private int mDozeScreenBrightness = PowerManager.BRIGHTNESS_DEFAULT;
@@ -1051,6 +1052,7 @@ public class DreamService extends Service implements Window.Callback {
// We must unbind from any overlay connection if we are unbound before finishing. // We must unbind from any overlay connection if we are unbound before finishing.
if (mOverlayConnection != null) { if (mOverlayConnection != null) {
mOverlayConnection.unbind(); mOverlayConnection.unbind();
mOverlayConnection = null;
} }
return super.onUnbind(intent); return super.onUnbind(intent);
@@ -1067,7 +1069,9 @@ public class DreamService extends Service implements Window.Callback {
// If there is an active overlay connection, signal that the dream is ending before // If there is an active overlay connection, signal that the dream is ending before
// continuing. Note that the overlay cannot rely on the unbound state, since another dream // continuing. Note that the overlay cannot rely on the unbound state, since another dream
// might have bound to it in the meantime. // might have bound to it in the meantime.
if (mOverlayConnection != null) { if (mOverlayConnection != null && !mOverlayFinishing) {
// Set mOverlayFinish to true to only allow this consumer to be added once.
mOverlayFinishing = true;
mOverlayConnection.addConsumer(overlay -> { mOverlayConnection.addConsumer(overlay -> {
try { try {
overlay.endDream(); overlay.endDream();