Handle potential security exceptions in WallpaperManagerCompatVL

amirzaidi · Sep 11, 2018 · aafd108 · aafd108
1 parent d85b164
commit aafd108
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/src/com/android/launcher3/compat/WallpaperManagerCompatVL.java b/src/com/android/launcher3/compat/WallpaperManagerCompatVL.java
@@ -148,7 +148,12 @@ private void handleResult(String result) {
 
     private static final int getWallpaperId(Context context) {
         if (!Utilities.ATLEAST_NOUGAT) {
-            Drawable wallpaper = WallpaperManager.getInstance(context).getDrawable();
+            Drawable wallpaper = null;
+            try {
+                wallpaper = WallpaperManager.getInstance(context).getDrawable();
+            } catch (RuntimeException e) {
+                Log.e(TAG, "Failed to create a wallpaper ID", e);
+            }
             if (wallpaper != null) {
                 Bitmap bm = Bitmap.createBitmap(1, 1, Bitmap.Config.ARGB_8888);
                 Canvas cv = new Canvas(bm);
@@ -261,12 +266,16 @@ public void run() {
                         Rect region = new Rect(0, 0, decoder.getWidth(), decoder.getHeight());
                         bitmap = decoder.decodeRegion(region, options);
                         decoder.recycle();
-                    } catch (IOException | NullPointerException e) {
+                    } catch (IOException | RuntimeException e) {
                         Log.e(TAG, "Fetching partial bitmap failed, trying old method", e);
                     }
                 }
                 if (bitmap == null) {
-                    drawable = wm.getDrawable();
+                    try {
+                        drawable = wm.getDrawable();
+                    } catch (RuntimeException e) {
+                        Log.e(TAG, "Failed to extract the wallpaper drawable", e);
+                    }
                 }
             }