Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jeff Sharkey
2016-04-13 22:11:16 +00:00
committed by Android (Google) Code Review
parent 33f576b9e9 383f9fedd6
commit 2d135ab150
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
View File

@@ -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);