From 518039dc04e11e950d5c0e6820ef3aee6771fa3b Mon Sep 17 00:00:00 2001
From: Jeff Chang <chengjeff@google.com>
Date: Mon, 25 Jan 2021 18:43:29 +0800
Subject: [PATCH] Make activity on visible and focusable leaf tasks be resumed

RuntimeExceptoin throw because of performing pause of activity that
is not resumed. This CL make sure the activity be resumed on visible
and focusable leaf tasks.

Bug: 177932048
Test: 1. use bubbles test app
      2. add some bubbles
      3. tap between bubbles, collapse stack, open stack
Change-Id: I571cb6d535736cc8dff70583cffa3c8a867c5722
---
 services/core/java/com/android/server/wm/Task.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/wm/Task.java b/services/core/java/com/android/server/wm/Task.java
index ec1588d153206..7b394cabb47e9 100644
--- a/services/core/java/com/android/server/wm/Task.java
+++ b/services/core/java/com/android/server/wm/Task.java
@@ -6041,7 +6041,9 @@ class Task extends WindowContainer<WindowContainer> {
             mInResumeTopActivity = true;
 
             if (isLeafTask()) {
-                someActivityResumed = resumeTopActivityInnerLocked(prev, options);
+                if (isFocusableAndVisible()) {
+                    someActivityResumed = resumeTopActivityInnerLocked(prev, options);
+                }
             } else {
                 int idx = mChildren.size() - 1;
                 while (idx >= 0) {