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

Commit 1704c627 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes I8a2c5ffb,I2750695d 

* changes:
  Fix live wallpaper not showing on lock screen after restore
  Workaround wallpaper restore race
parents d2c47843 96eb5b72

packages/WallpaperBackup/src/com/android/wallpaperbackup/WallpaperBackupAgent.java

+5 −3
Original line number Diff line number Diff line
@@ -217,9 +217,6 @@ public class WallpaperBackupAgent extends BackupAgent { 
        final int sysWhich = FLAG_SYSTEM | (lockImageStage.exists() ? 0 : FLAG_LOCK);



        try {

            // First off, revert to the factory state

            mWm.clear(FLAG_SYSTEM | FLAG_LOCK);



            // It is valid for the imagery to be absent; it means that we were not permitted

            // to back up the original image on the source device, or there was no user-supplied

            // wallpaper image present.
@@ -233,6 +230,11 @@ public class WallpaperBackupAgent extends BackupAgent { 
                    Slog.i(TAG, "Using wallpaper service " + wpService);

                }

                mWm.setWallpaperComponent(wpService, UserHandle.USER_SYSTEM);

                if (!lockImageStage.exists()) {

                    // We have a live wallpaper and no static lock image,

                    // allow live wallpaper to show "through" on lock screen.

                    mWm.clear(FLAG_LOCK);

                }

            } else {

                if (DEBUG) {

                    Slog.v(TAG, "Can't use wallpaper service " + wpService);