diff options
| author | 2020-03-05 22:48:24 +0800 | |
|---|---|---|
| committer | 2020-03-05 15:32:15 +0000 | |
| commit | 7baffbb7c5e3f60f4207f0cd948f664d437fe9af (patch) | |
| tree | 31e4afaee49a47bb4027ced4a1137304ad7705ef | |
| parent | 9eefc0aca44c2b83db49ae2d391adea69ae9ba04 (diff) | |
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
| -rw-r--r-- | services/core/java/com/android/server/wm/RootWindowContainer.java | 4 |
1 files 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 ada5685e6817..b3c3bbb01e4b 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); } } |