Merge "Make activity on visible and focusable leaf tasks be resumed" into sc-dev

2021-01-29 01:52:04 +00:00
parent 76e71ffa2c 518039dc04
commit 9c7bfbf651
1 changed files with 3 additions and 1 deletions
--- 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) {