Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Retain allowBackup annotation when system+lock wallpaper becomes lock only am: edd8dc83d5 am: 4cb8e2de6f" into nyc-mr1-dev-plus-aosp

Browse Source
This commit is contained in:
Android Build Merger (Role)
2016-10-13 19:14:06 +00:00
committed by Android (Google) Code Review
parent ba297baa04 8371d28717
commit d344b407df
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
View File

@@ -1487,7 +1487,7 @@ public class WallpaperManagerService extends IWallpaperManager.Stub {
lockWP.cropHint.set(sysWP.cropHint); lockWP.cropHint.set(sysWP.cropHint);
lockWP.width = sysWP.width; lockWP.width = sysWP.width;
lockWP.height = sysWP.height; lockWP.height = sysWP.height;
lockWP.allowBackup = false; lockWP.allowBackup = sysWP.allowBackup;
// Migrate the bitmap files outright; no need to copy // Migrate the bitmap files outright; no need to copy
try { try {