Add config flag to specify if wallpaper is rendered
DisplayContent#checkWaitingForWindows is used to block turning on
display at boot until wallpaper is ready. However when Android runs in a
container, wallpaper can be rendred outside of the container. In this
case DisplayContent#checkWaitingForWindows cannot find wallpaper window
and it blocks boot until timeout.
The CL adds config_checkWallpaperAtBoot flag to let
checkWaitingForWindow skip wallpaper check.
Bug: 38394691
Test: Check boot on marlin
Change-Id: I1d051521a5be06a4d773780de6fdc481d09acb95
diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java
index 3e47ea6..af7201c 100644
--- a/services/core/java/com/android/server/wm/DisplayContent.java
+++ b/services/core/java/com/android/server/wm/DisplayContent.java
@@ -2649,6 +2649,8 @@
// wallpaper, don't bother waiting for it
boolean wallpaperEnabled = mService.mContext.getResources().getBoolean(
com.android.internal.R.bool.config_enableWallpaperService)
+ && mService.mContext.getResources().getBoolean(
+ com.android.internal.R.bool.config_checkWallpaperAtBoot)
&& !mService.mOnlyCore;
if (DEBUG_SCREEN_ON || DEBUG_BOOT) Slog.i(TAG_WM,