Commit 8a8c0ed0 authored Dec 18, 2018 by Yunfan Chen

Apply splash screen and transfer starting window to all activities

This fixes a CTS failure and lack of splash screen for some activities.

When removing the global lock in AppWindowToken in change 1ee84ea6,
transferStartingWindow and creating splash screen was accidentally
wrapped by if(theme != 0) by mistake. The error will prevent simple app
from showing splash screen.

This patch fixes the error and the function is now aligned with the old
AppWindowContainerController#addStartingWindow.

Test: atest ActivityMetricsLoggerTests
Test: Test app in b/120968158 will show the splash screen with correct
      log information.
Bug: 120968158
Bug: 120779200

Change-Id: I34bf01874eecc3c0402d83d922445cd48ca1b39a

parent a03f107c

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;
		}