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

Merge "Unbind from overlay before checking attached." into tm-dev am: d5e4503c74 am: e56b19ea82

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

Change-Id: Iaa8c6c8bcd7ec8ceb36cc9c3ce5af6779b0c888c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Bryce Lee
2022-04-05 02:50:25 +00:00
committed by Automerger Merge Worker
parent 67263ff42c e56b19ea82
commit fac4ecd370
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1038,14 +1038,14 @@ public class DreamService extends Service implements Window.Callback {
}
mFinished = true;
mOverlayConnection.unbind(this);
if (mDreamToken == null) {
Slog.w(mTag, "Finish was called before the dream was attached.");
stopSelf();
return;
}
mOverlayConnection.unbind(this);
try {
// finishSelf will unbind the dream controller from the dream service. This will
// trigger DreamService.this.onDestroy and DreamService.this will die.