Catch null on queryIntentServices to fix NPE (#2263)

prakhar1989 · web-flow · commit ee74cd03d08d · 2020-12-16T10:32:54.000-08:00
diff --git a/firebase-inappmessaging-display/src/main/java/com/google/firebase/inappmessaging/display/FirebaseInAppMessagingDisplay.java b/firebase-inappmessaging-display/src/main/java/com/google/firebase/inappmessaging/display/FirebaseInAppMessagingDisplay.java
@@ -561,6 +561,6 @@ private boolean supportsCustomTabs(Activity activity) {
     customTabIntent.setPackage("com.android.chrome");
     List<ResolveInfo> resolveInfos =
         activity.getPackageManager().queryIntentServices(customTabIntent, 0);
-    return !resolveInfos.isEmpty();
+    return resolveInfos != null && !resolveInfos.isEmpty();
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -561,6 +561,6 @@ private boolean supportsCustomTabs(Activity activity) {`
`561`	`561`	`customTabIntent.setPackage("com.android.chrome");`
`562`	`562`	`List<ResolveInfo> resolveInfos =`
`563`	`563`	`activity.getPackageManager().queryIntentServices(customTabIntent, 0);`
`564`		`- return !resolveInfos.isEmpty();`
	`564`	`+ return resolveInfos != null && !resolveInfos.isEmpty();`
`565`	`565`	`}`
`566`	`566`	`}`