From 9095c5a8236957e677b2b13e42aad71a5b185e4d Mon Sep 17 00:00:00 2001 From: Jeff Sharkey Date: Fri, 4 Oct 2013 13:53:50 -0700 Subject: [PATCH] Avoid NPE when ProviderInfo is missing. Bug: 11052428 Change-Id: I6cb0cf2030a28f571c3f13cd0b9ba76627974697 --- core/java/android/provider/DocumentsContract.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/java/android/provider/DocumentsContract.java b/core/java/android/provider/DocumentsContract.java index 8bf6e4faf686f..631a8d41c0642 100644 --- a/core/java/android/provider/DocumentsContract.java +++ b/core/java/android/provider/DocumentsContract.java @@ -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; }