Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Avoid NPE when ProviderInfo is missing." into klp-dev

Browse Source
This commit is contained in:
Jeff Sharkey
2013-10-04 21:49:06 +00:00
committed by Android (Google) Code Review
parent 0ab7c883d5 9095c5a823
commit fc141ef20b
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/provider/DocumentsContract.java
View 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;
}