Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5a8c4c53 authored by Chris Poultney's avatar Chris Poultney Committed by Automerger Merge Worker
Browse files

Merge "Adds color update notification when setting lock screen live wallpaper"... 

Merge "Adds color update notification when setting lock screen live wallpaper" into udc-dev am: 61b756aa

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22704671



Change-Id: I9d0826953488c93cd12175814db590708c37e543
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 198eb7db 61b756aa

services/core/java/com/android/server/wallpaper/WallpaperManagerService.java

+3 −2
Original line number Diff line number Diff line
@@ -1229,10 +1229,11 @@ public class WallpaperManagerService extends IWallpaperManager.Stub 
                    return;

                }



                // Live wallpapers always are system wallpapers unless lock screen live wp is

                // enabled.

                which = mIsLockscreenLiveWallpaperEnabled ? mWallpaper.mWhich : FLAG_SYSTEM;

                mWallpaper.primaryColors = primaryColors;



                // Live wallpapers always are system wallpapers.

                which = FLAG_SYSTEM;

                // It's also the lock screen wallpaper when we don't have a bitmap in there.

                if (displayId == DEFAULT_DISPLAY) {

                    final WallpaperData lockedWallpaper = mLockWallpaperMap.get(mWallpaper.userId);