commit | ee1da27fa63b30a7ff7815d4d054466bd4b7c263 | [log] [tgz] |
---|---|---|
author | Sudheer Shanka <sudheersai@google.com> | Sat Oct 20 20:11:44 2018 -0700 |
committer | Sudheer Shanka <sudheersai@google.com> | Sat Oct 20 20:11:44 2018 -0700 |
tree | d3de8788741750473f24676f88bc143773b2818f | |
parent | 5b3a6a81871925ff9a6fdcee2f90aa8a09b87670 [diff] |
When finishing a heavy weight process, finish the activities in it. Change-Id: I18b40d3b40df5f5a2698d0949a89d2e015e95f6e Fixes: 116616949 Test: atest android.app.cts.ActivityManagerProcessStateTest#testCantSaveStateLaunchAndSwitch
diff --git a/services/core/java/com/android/server/am/ActivityTaskManagerService.java b/services/core/java/com/android/server/am/ActivityTaskManagerService.java index 8ae5495..f79d9aa 100644 --- a/services/core/java/com/android/server/am/ActivityTaskManagerService.java +++ b/services/core/java/com/android/server/am/ActivityTaskManagerService.java
@@ -5864,6 +5864,9 @@ @Override public void finishHeavyWeightApp() { synchronized (mGlobalLock) { + if (mHeavyWeightProcess != null) { + mHeavyWeightProcess.finishActivities(); + } ActivityTaskManagerService.this.clearHeavyWeightProcessIfEquals( mHeavyWeightProcess); }