commit 108b1be70f115cda3c62d46d9f9808e6d465a3c0
author Edward Zhang <hsrzq@users.noreply.github.com> Thu Aug 11 00:24:42 2022 +0800
committer GitHub <noreply@github.com> Wed Aug 10 09:24:42 2022 -0700
tree be089ac0a3a10076e959651dfea747d97ffce4a3
parent adbd366b1d8fb6ee99420ed239ed74686a8c0b60

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>

lottie/src/main/java/com/airbnb/lottie/manager/ImageAssetManager.java

diff --git a/lottie/src/main/java/com/airbnb/lottie/manager/ImageAssetManager.java b/lottie/src/main/java/com/airbnb/lottie/manager/ImageAssetManager.java
index 0634357..afda3b5 100644
--- 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 @@
     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());