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

Merge "Clear DreamOverlayCallback reference on destroy." into udc-qpr-dev

Browse Source
This commit is contained in:
Bryce Lee
2023-07-27 15:08:34 +00:00
committed by Android (Google) Code Review
parent 076a75f35c 078e715cd4
commit 651440d116
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -244,13 +244,7 @@ public class DreamService extends Service implements Window.Callback {
private DreamOverlayConnectionHandler mOverlayConnection;
private final IDreamOverlayCallback mOverlayCallback = new IDreamOverlayCallback.Stub() {
@Override
public void onExitRequested() {
// Simply finish dream when exit is requested.
mHandler.post(() -> finish());
}
};
private IDreamOverlayCallback mOverlayCallback;
public DreamService() {
@@ -877,6 +871,13 @@ public class DreamService extends Service implements Window.Callback {
mDreamComponent = new ComponentName(this, getClass());
mShouldShowComplications = fetchShouldShowComplications(this /*context*/,
fetchServiceInfo(this /*context*/, mDreamComponent));
mOverlayCallback = new IDreamOverlayCallback.Stub() {
@Override
public void onExitRequested() {
// Simply finish dream when exit is requested.
mHandler.post(() -> finish());
}
};
super.onCreate();
}
@@ -1083,7 +1084,7 @@ public class DreamService extends Service implements Window.Callback {
// Just in case destroy came in before detach, let's take care of that now
detach();
mOverlayCallback = null;
super.onDestroy();
}