Merge "Fix crash in clearWallpaper()" into nyc-mr1-dev

2016-09-22 22:10:11 +00:00
parent b495cca72b a2bd512034
commit bd2a00f848
1 changed files with 2 additions and 1 deletions
--- 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());
    }

    /**