summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2017-02-13 20:04:08 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2017-02-13 20:04:11 +0000
commit29e3920c4e324ac75a90d71da9af0c098d2fe2ea (patch)
tree26c171e97cda7d3fadbd181a002eb216f755033e
parentddc6e0b7aeae8a15d4844847419d7d69cea4757f (diff)
parente7aadaaa3a24218e4ccd823cd82c8cdf6f49b601 (diff)
Merge "Workaround wallpaper restore race" into nyc-mr2-dev
-rw-r--r--packages/WallpaperBackup/src/com/android/wallpaperbackup/WallpaperBackupAgent.java3
1 files changed, 0 insertions, 3 deletions
diff --git a/packages/WallpaperBackup/src/com/android/wallpaperbackup/WallpaperBackupAgent.java b/packages/WallpaperBackup/src/com/android/wallpaperbackup/WallpaperBackupAgent.java
index ff934ef18677..19da32c83cd5 100644
--- 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.