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

Merge "Fix DreamService not finishing correctly" into rvc-dev

Browse Source
This commit is contained in:
Galia Peycheva
2020-04-14 17:11:45 +00:00
committed by Android (Google) Code Review
parent 4456f7d2d6 95b12348eb
commit e7eee891b4
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -900,10 +900,11 @@ public class DreamService extends Service implements Window.Callback {
public final void finish() {
if (mDebug) Slog.v(TAG, "finish(): mFinished=" + mFinished);
if (mActivity != null) {
if (!mActivity.isFinishing()) {
Activity activity = mActivity;
if (activity != null) {
if (!activity.isFinishing()) {
// In case the activity is not finished yet, do it now.
mActivity.finishAndRemoveTask();
activity.finishAndRemoveTask();
}
return;
}
@@ -1106,6 +1107,7 @@ public class DreamService extends Service implements Window.Callback {
@Override
public void onViewDetachedFromWindow(View v) {
mActivity = null;
finish();
}
});