From 4324f9f2476afc08e41700faa23ee33881d0d3b8 Mon Sep 17 00:00:00 2001 From: Evan Rosky Date: Thu, 21 Apr 2016 11:37:07 -0700 Subject: [PATCH] Get lockscreen wallpaper even for current user Bug: 25184308 Change-Id: Id8093eccc82ffa9953eebd3c26fd6861a3749a80 (cherry picked from commit 39704ef5e412b031a7b99c1696f5544f0e4f4e7e) --- .../systemui/statusbar/phone/LockscreenWallpaper.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/LockscreenWallpaper.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/LockscreenWallpaper.java index ef19d95c11956..586741e75582c 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/LockscreenWallpaper.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/LockscreenWallpaper.java @@ -115,15 +115,13 @@ public class LockscreenWallpaper extends IWallpaperManagerCallback.Stub implemen IoUtils.closeQuietly(fd); } } else { - if (selectedUser != null && selectedUser.getIdentifier() != currentUserId) { - // When selected user is different from the current user, show the selected - // user's static wallpaper. + if (selectedUser != null) { + // Show the selected user's static wallpaper. return LoaderResult.success( mWallpaperManager.getBitmapAsUser(selectedUser.getIdentifier())); } else { - // When there is no selected user, or it's same as the current user, show the - // system (possibly dynamic) wallpaper for the selected user. + // When there is no selected user, show the system wallpaper return LoaderResult.success(null); } }