From ee1da27fa63b30a7ff7815d4d054466bd4b7c263 Mon Sep 17 00:00:00 2001
From: Sudheer Shanka <sudheersai@google.com>
Date: Sat, 20 Oct 2018 20:11:44 -0700
Subject: [PATCH] When finishing a heavy weight process, finish the activities
 in it.

Change-Id: I18b40d3b40df5f5a2698d0949a89d2e015e95f6e
Fixes: 116616949
Test: atest android.app.cts.ActivityManagerProcessStateTest#testCantSaveStateLaunchAndSwitch
---
 .../java/com/android/server/am/ActivityTaskManagerService.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/services/core/java/com/android/server/am/ActivityTaskManagerService.java b/services/core/java/com/android/server/am/ActivityTaskManagerService.java
index 8ae5495cfa055..f79d9aa9ba678 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 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
         @Override
         public void finishHeavyWeightApp() {
             synchronized (mGlobalLock) {
+                if (mHeavyWeightProcess != null) {
+                    mHeavyWeightProcess.finishActivities();
+                }
                 ActivityTaskManagerService.this.clearHeavyWeightProcessIfEquals(
                         mHeavyWeightProcess);
             }