improve lock screen wallpaper behavior

 - Fix lockscreen wallpaper not being reloaded on user switch.
   There was an issue where the wrong user id was being queried for the
   keyguard wallpaper. Always use the current user id.

 - Also clean up a left-over call for some regular wallpaper
   migration logic that the lock screen wallpaper

 - Add method for removing references to the current lock screen
   wallpaper, which we call from systemui when switching users.

 - Only apply the lock screen wallpaper if there is no media metadata
   to show. There were some cases when it would still appear even when
   music was playing.

Change-Id: I610a38ac11a19638298ca9490b3c87b7ab6106f2
Signed-off-by: Roman Birg <roman@cyngn.com>

1 files changed, 1 insertions, 13 deletions

diff --git a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
index 420e775..ee926a4 100644
--- a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
+++ b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
@@ -936,15 +936,7 @@ public class WallpaperManagerService extends IWallpaperManager.Stub {
     public ParcelFileDescriptor getKeyguardWallpaper(IWallpaperManagerCallback cb,
                                                      Bundle outParams) {
         synchronized (mLock) {
-            // This returns the current user's wallpaper, if called by a system service. Else it
-            // returns the wallpaper for the calling user.
-            int callingUid = Binder.getCallingUid();
-            int wallpaperUserId = 0;
-            if (callingUid == android.os.Process.SYSTEM_UID) {
-                wallpaperUserId = mCurrentUserId;
-            } else {
-                wallpaperUserId = UserHandle.getUserId(callingUid);
-            }
+            int wallpaperUserId = mCurrentUserId;
             KeyguardWallpaperData wallpaper = mKeyguardWallpaperMap.get(wallpaperUserId);
             try {
                 if (outParams != null) {
@@ -1581,10 +1573,6 @@ public class WallpaperManagerService extends IWallpaperManager.Stub {
         JournaledFile journal = makeJournaledFile(KEYGUARD_WALLPAPER_INFO, userId);
         FileInputStream stream = null;
         File file = journal.chooseForRead();
-        if (!file.exists()) {
-            // This should only happen one time, when upgrading from a legacy system
-            migrateFromOld();
-        }
         KeyguardWallpaperData keyguardWallpaper = mKeyguardWallpaperMap.get(userId);
         if (keyguardWallpaper == null) {
             keyguardWallpaper = new KeyguardWallpaperData(userId);