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

Merge "Get lockscreen wallpaper even for current user"

Browse Source
This commit is contained in:
Evan Rosky
2016-05-05 22:18:10 +00:00
committed by Android (Google) Code Review
parent fa50e64e59 4324f9f247
commit 80ff968d3b
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/SystemUI/src/com/android/systemui/statusbar/phone/LockscreenWallpaper.java
View File

@@ -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);
}
}