From 96eb5b724bab31125e15eef2c926f6648567c3a1 Mon Sep 17 00:00:00 2001 From: Bryan Mawhinney Date: Tue, 7 Feb 2017 15:27:19 +0000 Subject: [PATCH] Fix live wallpaper not showing on lock screen after restore A recent change in nyc-mr2 means that setWallpaperComponent will promote any static system wallpaper to the lock screen. If we don't actually have a static lock wallpaper to restore, we need to explicitly clear the lock wallpaper to have the live one show through Test: manually using adb backup / restore Bug: 35090402 Change-Id: I8a2c5ffbaefe172c9d78a9f746ab87d9bc6b7448 --- .../src/com/android/wallpaperbackup/WallpaperBackupAgent.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packages/WallpaperBackup/src/com/android/wallpaperbackup/WallpaperBackupAgent.java b/packages/WallpaperBackup/src/com/android/wallpaperbackup/WallpaperBackupAgent.java index 19da32c83cd5..4254a0ba200a 100644 --- a/packages/WallpaperBackup/src/com/android/wallpaperbackup/WallpaperBackupAgent.java +++ b/packages/WallpaperBackup/src/com/android/wallpaperbackup/WallpaperBackupAgent.java @@ -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); -- 2.11.0