Merge "Apply splash screen and transfer starting window to all activities" (6bd55938) · Commits · e / os / android_frameworks_base

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

+14 −14

Original line number	Diff line number	Diff line
		@@ -1837,6 +1837,7 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree
		return false;
		}
		}
		}

		if (transferStartingWindow(transferFrom)) {
		return true;
		@@ -1853,7 +1854,6 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree
		theme, compatInfo, nonLocalizedLabel, labelRes, icon, logo, windowFlags,
		getMergedOverrideConfiguration());
		scheduleAddStartingWindow();
		}
		return true;
		}