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

This commit is contained in:
TreeHugger Robot
2017-02-13 20:04:08 +00:00
committed by Android (Google) Code Review

View File

@@ -217,9 +217,6 @@ public class WallpaperBackupAgent extends BackupAgent {
final int sysWhich = FLAG_SYSTEM | (lockImageStage.exists() ? 0 : FLAG_LOCK); final int sysWhich = FLAG_SYSTEM | (lockImageStage.exists() ? 0 : FLAG_LOCK);
try { 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 // 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 // to back up the original image on the source device, or there was no user-supplied
// wallpaper image present. // wallpaper image present.