OSDN Git Service

Avoid NPE when ProviderInfo is missing.
authorJeff Sharkey <jsharkey@android.com>
Fri, 4 Oct 2013 20:53:50 +0000 (13:53 -0700)
committerJeff Sharkey <jsharkey@android.com>
Fri, 4 Oct 2013 20:53:50 +0000 (13:53 -0700)
Bug: 11052428
Change-Id: I6cb0cf2030a28f571c3f13cd0b9ba76627974697

core/java/android/provider/DocumentsContract.java

index 8bf6e4f..631a8d4 100644 (file)
@@ -561,7 +561,7 @@ public final class DocumentsContract {
 
         final ProviderInfo info = context.getPackageManager()
                 .resolveContentProvider(uri.getAuthority(), PackageManager.GET_META_DATA);
-        if (info.metaData != null && info.metaData.containsKey(
+        if (info != null && info.metaData != null && info.metaData.containsKey(
                 DocumentsContract.META_DATA_DOCUMENT_PROVIDER)) {
             return true;
         }