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

Commit c32dde6d authored by Christopher Tate's avatar Christopher Tate Committed by android-build-merger
Browse files

Merge "Don\'t stomp live wallpapers when tidying up imagery" into nyc-dev am: 63a95b0d 

am: ebd0b3da

* commit 'ebd0b3da':
  Don't stomp live wallpapers when tidying up imagery
parents 282873a3 ebd0b3da

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

+21 −7
Original line number Original line Diff line number Diff line
@@ -730,14 +730,28 @@ public class WallpaperManagerService extends IWallpaperManager.Stub { 
    public void systemRunning() {

    public void systemRunning() {

        if (DEBUG) Slog.v(TAG, "systemReady");

        if (DEBUG) Slog.v(TAG, "systemReady");

        WallpaperData wallpaper = mWallpaperMap.get(UserHandle.USER_SYSTEM);

        WallpaperData wallpaper = mWallpaperMap.get(UserHandle.USER_SYSTEM);

        // If we think we're going to be using the system image wallpaper imagery, make

        // sure we have something to render

        if (mImageWallpaper.equals(wallpaper.nextWallpaperComponent)) {

            // No crop file? Make sure we've finished the processing sequence if necessary

            // No crop file? Make sure we've finished the processing sequence if necessary

            if (!wallpaper.cropExists()) {

            if (!wallpaper.cropExists()) {

                if (DEBUG) {

                    Slog.i(TAG, "No crop; regenerating from source");

                }

                generateCrop(wallpaper);

                generateCrop(wallpaper);

            }

            }

            // Still nothing?  Fall back to default.

            // Still nothing?  Fall back to default.

            if (!wallpaper.cropExists()) {

            if (!wallpaper.cropExists()) {

                if (DEBUG) {

                    Slog.i(TAG, "Unable to regenerate crop; resetting");

                }

                clearWallpaperLocked(false, FLAG_SET_SYSTEM, UserHandle.USER_SYSTEM, null);

                clearWallpaperLocked(false, FLAG_SET_SYSTEM, UserHandle.USER_SYSTEM, null);

            }

            }

        } else {

            if (DEBUG) {

                Slog.i(TAG, "Nondefault wallpaper component; gracefully ignoring");

            }

        }

        switchWallpaper(wallpaper, null);

        switchWallpaper(wallpaper, null);

        wallpaper.wallpaperObserver = new WallpaperObserver(wallpaper);

        wallpaper.wallpaperObserver = new WallpaperObserver(wallpaper);

        wallpaper.wallpaperObserver.startWatching();

        wallpaper.wallpaperObserver.startWatching();