From a2bd512034f17ca2a6309ff80bc5ed0ba8660182 Mon Sep 17 00:00:00 2001 From: Christopher Tate Date: Thu, 22 Sep 2016 13:18:05 -0700 Subject: [PATCH] Fix crash in clearWallpaper() The underlying clearWallpaper() service method demands that only a single kind of wallpaper be specified as the target; but a recent patch attempted to expand the client-side legacy method to apply to all kinds of wallpaper, incorrectly. This patch corrects that client- side code to do things properly. Bug 30456015 Change-Id: I0a881957b881206e5eb775c6879ba90f10f9ffb0 --- core/java/android/app/WallpaperManager.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/java/android/app/WallpaperManager.java b/core/java/android/app/WallpaperManager.java index a7ad6193b0dc..aa0eaaebf975 100644 --- a/core/java/android/app/WallpaperManager.java +++ b/core/java/android/app/WallpaperManager.java @@ -1393,7 +1393,8 @@ public class WallpaperManager { */ @SystemApi public void clearWallpaper() { - clearWallpaper(FLAG_SYSTEM | FLAG_LOCK, mContext.getUserId()); + clearWallpaper(FLAG_LOCK, mContext.getUserId()); + clearWallpaper(FLAG_SYSTEM, mContext.getUserId()); } /** -- 2.11.0