Merge "Start home activity if focusable task is not available" into rvc-dev... (524e6885) · Commits · e / os / android_frameworks_base

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

+2 −2

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