Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: Iccbdd8d87deca8e9020d33336b4c8df4bd54067b
This commit is contained in:
Automerger Merge Worker
2020-03-09 06:02:51 +00:00
parent 2216264aa6 b56f1cd9b3
commit aa13dba7fd
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/wm/RootWindowContainer.java
View File

@@ -2265,8 +2265,8 @@ class RootWindowContainer extends WindowContainer<DisplayContent>
final ActivityStack focusedStack = display.getFocusedStack(); final ActivityStack focusedStack = display.getFocusedStack();
if (focusedStack != null) { if (focusedStack != null) {
result |= focusedStack.resumeTopActivityUncheckedLocked(target, targetOptions); result |= focusedStack.resumeTopActivityUncheckedLocked(target, targetOptions);
} else if (targetStack == null && display.getStackCount() == 0) { } else if (targetStack == null) {
result |= resumeHomeActivity(null /* prev */, "empty-display", result |= resumeHomeActivity(null /* prev */, "no-focusable-task",
display.mDisplayId); display.mDisplayId);
} }
} }