Merge "Start home activity if focusable task is not available" into rvc-dev am: fcf25e08b7 (8fa26d5a) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/wm/RootWindowContainer.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -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);
		}
		}