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

Merge "Make DreamService detach on DreamActivity onDestroy" into udc-dev

Browse Source
This commit is contained in:
Galia Peycheva
2023-03-02 17:46:38 +00:00
committed by Android (Google) Code Review
parent 19573fe42d 3f6a4e9d5c
commit 10104fccfc
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/service/dreams/DreamActivity.java
View File

@@ -70,7 +70,7 @@ public class DreamActivity extends Activity {
@Override @Override
public void onDestroy() { public void onDestroy() {
if (mCallback != null && !isFinishing()) { if (mCallback != null) {
mCallback.onActivityDestroyed(); mCallback.onActivityDestroyed();
} }

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

@@ -1588,7 +1588,8 @@ public class DreamService extends Service implements Window.Callback {
// If DreamActivity is destroyed, wake up from Dream. // If DreamActivity is destroyed, wake up from Dream.
void onActivityDestroyed() { void onActivityDestroyed() {
mActivity = null; mActivity = null;
onDestroy(); mWindow = null;
detach();
} }
} }