Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9a1fbfb4 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by android-build-merger
Browse files

Merge "Bind wallpaper at later boot phase." into nyc-dev 

am: 2d135ab1

* commit '2d135ab1':
  Bind wallpaper at later boot phase.

Change-Id: I27edc0e1c3e30d6ac249a9cbbd98cf4a56a9e5eb
parents 3793bd6e 2d135ab1

services/core/java/com/android/server/wallpaper/WallpaperManagerService.java

+2 −3
Original line number Diff line number Diff line
@@ -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);