Merge "Fix unable starting home on an empty display" (43ccaf9e) · Commits · e / os / android_frameworks_base

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

+6 −9

Original line number	Diff line number	Diff line
		@@ -1039,11 +1039,8 @@ public class ActivityStackSupervisor extends ConfigurationContainer implements D
		boolean didSomething = false;
		for (int displayNdx = mActivityDisplays.size() - 1; displayNdx >= 0; --displayNdx) {
		final ActivityDisplay display = mActivityDisplays.get(displayNdx);
		for (int stackNdx = display.getChildCount() - 1; stackNdx >= 0; --stackNdx) {
		final ActivityStack stack = display.getChildAt(stackNdx);
		if (!isTopDisplayFocusedStack(stack)) {
		continue;
		}
		final ActivityStack stack = display.getFocusedStack();
		if (stack != null) {
		stack.getAllRunningVisibleActivitiesLocked(mTmpActivityList);
		final ActivityRecord top = stack.topRunningActivityLocked();
		final int size = mTmpActivityList.size();
		@@ -2567,10 +2564,10 @@ public class ActivityStackSupervisor extends ConfigurationContainer implements D
		windowingMode = options != null ? options.getLaunchWindowingMode()
		: r.getWindowingMode();
		}
		return activityDisplay.createStack(
		windowingMode,
		options != null ? options.getLaunchActivityType() : r.getActivityType(),
		true /onTop/);
		final int activityType =
		options != null && options.getLaunchActivityType() != ACTIVITY_TYPE_UNDEFINED
		? options.getLaunchActivityType() : r.getActivityType();
		return activityDisplay.createStack(windowingMode, activityType, true /onTop/);
		}

		Slog.w(TAG, "getValidLaunchStackOnDisplay: can't launch on displayId " + displayId);

+2 −1

Original line number	Diff line number	Diff line
		@@ -1859,7 +1859,8 @@ class ActivityStarter {
		}
		}

		if (mStartActivity.isActivityTypeHome() && intentActivity != null
		if (intentActivity != null
		&& (mStartActivity.isActivityTypeHome() \|\| intentActivity.isActivityTypeHome())
		&& intentActivity.getDisplayId() != mPreferredDisplayId) {
		// Do not reuse home activity on other displays.
		intentActivity = null;