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

Change-Id: Iccbdd8d87deca8e9020d33336b4c8df4bd54067b
2020-03-09 06:02:51 +00:00
parent 2216264aa6 b56f1cd9b3
commit aa13dba7fd
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);
                }
            }