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

Prevent dream service finishSelf before it was attached

Browse Source 
Bring back stopSelf logic to prevent dream service finishSelf before any
token attached.

Fix: 150818348
Test: manual test, won't throw exp while leaving dream service.
Merged-In: I31bb4f32013b9fa0aa2263b94117060e4d3a7341
Change-Id: I31bb4f32013b9fa0aa2263b94117060e4d3a7341
This commit is contained in:
Jerry Chang
2020-03-10 10:21:27 +08:00
parent 97a8c8a153
commit b050ab8a78
1 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -906,22 +906,27 @@ public class DreamService extends Service implements Window.Callback {
if (!mActivity.isFinishing()) { if (!mActivity.isFinishing()) {
// In case the activity is not finished yet, do it now. // In case the activity is not finished yet, do it now.
mActivity.finishAndRemoveTask(); mActivity.finishAndRemoveTask();
return;
} }
} else if (!mWindowless) { return;
Slog.w(TAG, "Finish was called before the dream was attached.");
} }
if (!mFinished) { if (mFinished) {
mFinished = true; return;
}
mFinished = true;
try { if (mDreamToken == null) {
// finishSelf will unbind the dream controller from the dream service. This will Slog.w(TAG, "Finish was called before the dream was attached.");
// trigger DreamService.this.onDestroy and DreamService.this will die. stopSelf();
mDreamManager.finishSelf(mDreamToken, true /*immediate*/); return;
} catch (RemoteException ex) { }
// system server died
} try {
// finishSelf will unbind the dream controller from the dream service. This will
// trigger DreamService.this.onDestroy and DreamService.this will die.
mDreamManager.finishSelf(mDreamToken, true /*immediate*/);
} catch (RemoteException ex) {
// system server died
} }
} }