Merge "Workaround wallpaper restore race" into nyc-mr2-dev

am: 29e3920c4e Change-Id: Ida5a953e75c326a1b5f555c820d807e7cb91b797
2017-02-13 20:09:34 +00:00
parent 6982f2df37 29e3920c4e
commit b70bd94b6b
1 changed files with 0 additions and 3 deletions
--- a/packages/WallpaperBackup/src/com/android/wallpaperbackup/WallpaperBackupAgent.java
+++ b/packages/WallpaperBackup/src/com/android/wallpaperbackup/WallpaperBackupAgent.java
@@ -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.