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

Merge "Migrate system+lock wallpaper to lock-only when setting live wp" into nyc-mr2-dev

Browse Source
This commit is contained in:
Chris Tate
2016-12-20 01:01:52 +00:00
committed by Android (Google) Code Review
parent 9ec4256a17 7cd0010df6
commit 793c634d1e
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1563,6 +1563,19 @@ public class WallpaperManagerService extends IWallpaperManager.Stub {
throw new IllegalStateException("Wallpaper not yet initialized for user " + userId); throw new IllegalStateException("Wallpaper not yet initialized for user " + userId);
} }
final long ident = Binder.clearCallingIdentity(); final long ident = Binder.clearCallingIdentity();
// Live wallpapers can't be specified for keyguard. If we're using a static
// system+lock image currently, migrate the system wallpaper to be a lock-only
// image as part of making a different live component active as the system
// wallpaper.
if (mImageWallpaper.equals(wallpaper.wallpaperComponent)) {
if (mLockWallpaperMap.get(userId) == null) {
// We're using the static imagery and there is no lock-specific image in place,
// therefore it's a shared system+lock image that we need to migrate.
migrateSystemToLockWallpaperLocked(userId);
}
}
try { try {
wallpaper.imageWallpaperPending = false; wallpaper.imageWallpaperPending = false;
if (bindWallpaperComponentLocked(name, false, true, wallpaper, null)) { if (bindWallpaperComponentLocked(name, false, true, wallpaper, null)) {