From 383f9fedd6c3423d7a8abed21151a89808fa0fab Mon Sep 17 00:00:00 2001 From: Jeff Sharkey Date: Wed, 13 Apr 2016 16:08:15 -0600 Subject: [PATCH] Bind wallpaper at later boot phase. We need to wait until third-party apps can start before we try binding to the wallpaper. Bug: 28166684 Change-Id: I6ef559a667104e830e97da68b437ff592816f6f3 --- .../java/com/android/server/wallpaper/WallpaperManagerService.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java index ca1a7ac80259..10e30ed48da8 100644 --- a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java +++ b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java @@ -128,6 +128,8 @@ public class WallpaperManagerService extends IWallpaperManager.Stub { public void onBootPhase(int phase) { if (phase == SystemService.PHASE_ACTIVITY_MANAGER_READY) { mService.systemReady(); + } else if (phase == SystemService.PHASE_THIRD_PARTY_APPS_CAN_START) { + mService.switchUser(UserHandle.USER_SYSTEM, null); } } @@ -850,9 +852,6 @@ public class WallpaperManagerService extends IWallpaperManager.Stub { Slog.i(TAG, "Nondefault wallpaper component; gracefully ignoring"); } } - switchWallpaper(wallpaper, null); - wallpaper.wallpaperObserver = new WallpaperObserver(wallpaper); - wallpaper.wallpaperObserver.startWatching(); IntentFilter userFilter = new IntentFilter(); userFilter.addAction(Intent.ACTION_USER_REMOVED); -- 2.11.0