Merge "Start secondary home activity only if device support Multi-Display" (420fb7c4) · Commits · e / os / android_frameworks_base

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

+7 −0

Original line number	Diff line number	Diff line
		@@ -362,6 +362,8 @@ class RootActivityContainer extends ConfigurationContainer
		if (displayId == DEFAULT_DISPLAY) {
		homeIntent = mService.getHomeIntent();
		aInfo = resolveHomeActivity(userId, homeIntent);
		} else if (!mService.mSupportsMultiDisplay) {
		return false;
		} else {
		Pair<ActivityInfo, Intent> info = resolveSecondaryHomeActivity(userId, displayId);
		aInfo = info.first;
		@@ -544,6 +546,11 @@ class RootActivityContainer extends ConfigurationContainer
		return true;
		}

		if (displayId != DEFAULT_DISPLAY && !mService.mSupportsMultiDisplay) {
		// Can't launch home on secondary display if device not support multi-display.
		return false;
		}

		final boolean deviceProvisioned = Settings.Global.getInt(
		mService.mContext.getContentResolver(),
		Settings.Global.DEVICE_PROVISIONED, 0) != 0;