Merge "Start home activity if focusable task is not available" into rvc-dev am: fcf25e08b7 am: d462b131c7

Change-Id: I2f9a6a7211274c4676aa857e9ad51b81a13aef7f
2020-03-09 05:45:35 +00:00
parent aea9519e41 d462b131c7
commit 524e68850d
1 changed files with 2 additions and 2 deletions
--- a/services/core/java/com/android/server/wm/RootWindowContainer.java
+++ b/services/core/java/com/android/server/wm/RootWindowContainer.java
@@ -2265,8 +2265,8 @@ class RootWindowContainer extends WindowContainer<DisplayContent>
                final ActivityStack focusedStack = display.getFocusedStack();
                if (focusedStack != null) {
                    result |= focusedStack.resumeTopActivityUncheckedLocked(target, targetOptions);
-                } else if (targetStack == null && display.getStackCount() == 0) {
-                    result |= resumeHomeActivity(null /* prev */, "empty-display",
+                } else if (targetStack == null) {
+                    result |= resumeHomeActivity(null /* prev */, "no-focusable-task",
                            display.mDisplayId);
                }
            }