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 fb491ca54b..dfd07fa1af 100644 --- a/lottie/src/main/java/com/airbnb/lottie/manager/ImageAssetManager.java +++ b/lottie/src/main/java/com/airbnb/lottie/manager/ImageAssetManager.java @@ -138,6 +138,9 @@ public void setDelegate(@Nullable ImageAssetDelegate assetDelegate) { } public boolean hasSameContext(Context context) { + if (context == null) { + return this.context == null; + } Context contextToCompare = this.context instanceof Application ? context.getApplicationContext() : context; return contextToCompare == this.context; }