Merge "Fix live wallpaper not showing on lock screen after restore" into nyc-mr2-dev

This commit is contained in:
TreeHugger Robot
2017-02-13 20:49:50 +00:00
committed by Android (Google) Code Review

View File

@@ -230,6 +230,11 @@ public class WallpaperBackupAgent extends BackupAgent {
Slog.i(TAG, "Using wallpaper service " + wpService);
}
mWm.setWallpaperComponent(wpService, UserHandle.USER_SYSTEM);
if (!lockImageStage.exists()) {
// We have a live wallpaper and no static lock image,
// allow live wallpaper to show "through" on lock screen.
mWm.clear(FLAG_LOCK);
}
} else {
if (DEBUG) {
Slog.v(TAG, "Can't use wallpaper service " + wpService);