1 files changed, 4 insertions, 0 deletions
diff --git a/core/java/android/content/ContentProviderClient.java b/core/java/android/content/ContentProviderClient.java
index 16b5a4bc0404..9221fbb50c96 100644
--- a/core/java/android/content/ContentProviderClient.java
+++ b/core/java/android/content/ContentProviderClient.java
@@ -144,6 +144,10 @@ public class ContentProviderClient implements AutoCloseable {
             }
             final Cursor cursor = mContentProvider.query(mPackageName, url, projection, selection,
                     selectionArgs, sortOrder, remoteCancellationSignal);
+            if (cursor == null) {
+                return null;
+            }
+
             if ("com.google.android.gms".equals(mPackageName)) {
                 // They're casting to a concrete subclass, sigh
                 return cursor;