From 7baffbb7c5e3f60f4207f0cd948f664d437fe9af Mon Sep 17 00:00:00 2001
From: Riddle Hsu <riddlehsu@google.com>
Date: Thu, 5 Mar 2020 22:48:24 +0800
Subject: [PATCH] Start home activity if focusable task is not available

Remove the condition of stack count. Because there may have
task tiles or tasks of other user.

Bug: 150853749
Test: atest StartActivityTests#testStartHomeIfNoActivities
Test: No black screen by force-stop home package.

Change-Id: Idc02e9fa6a41de190a74b986da6b0a4e09c9e9bb
---
 .../core/java/com/android/server/wm/RootWindowContainer.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/services/core/java/com/android/server/wm/RootWindowContainer.java b/services/core/java/com/android/server/wm/RootWindowContainer.java
index ada5685e6817a..b3c3bbb01e4b5 100644
--- a/services/core/java/com/android/server/wm/RootWindowContainer.java
+++ b/services/core/java/com/android/server/wm/RootWindowContainer.java
@@ -2263,8 +2263,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);
                 }
             }