Fix ImageAssetManager.bitmapForId NPE crash (#2117)

In Android docs, BitmapFactory.decodeStream may return null so it must be handled correctly. Co-authored-by: TechQI <TechQI@126.com>
airbnb · Aug 10, 2022 · 108b1be · 108b1be
1 parent adbd366
commit 108b1be
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/lottie/src/main/java/com/airbnb/lottie/manager/ImageAssetManager.java b/lottie/src/main/java/com/airbnb/lottie/manager/ImageAssetManager.java
@@ -118,7 +118,11 @@ public void setDelegate(@Nullable ImageAssetDelegate assetDelegate) {
     try {
       bitmap = BitmapFactory.decodeStream(is, null, opts);
     } catch (IllegalArgumentException e) {
-      Logger.warning("Unable to decode image.", e);
+      Logger.warning("Unable to decode image `" + id + "`.", e);
+      return null;
+    }
+    if (bitmap == null) {
+      Logger.warning("Decoded image `" + id + "` is null.");
       return null;
     }
     bitmap = Utils.resizeBitmapIfNeeded(bitmap, asset.getWidth(), asset.getHeight());