Merge "Remember all wallpapers' backup-allow state" into nyc-mr1-dev

This commit is contained in:
TreeHugger Robot
2016-08-13 00:24:10 +00:00
committed by Android (Google) Code Review

View File

@@ -1400,10 +1400,8 @@ public class WallpaperManagerService extends IWallpaperManager.Stub {
wallpaper.whichPending = which; wallpaper.whichPending = which;
wallpaper.setComplete = completion; wallpaper.setComplete = completion;
wallpaper.cropHint.set(cropHint); wallpaper.cropHint.set(cropHint);
if ((which & FLAG_SYSTEM) != 0) {
wallpaper.allowBackup = allowBackup; wallpaper.allowBackup = allowBackup;
} }
}
return pfd; return pfd;
} finally { } finally {
Binder.restoreCallingIdentity(ident); Binder.restoreCallingIdentity(ident);