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

am 77b7f39f: am fc141ef2: Merge "Avoid NPE when ProviderInfo is missing." into klp-dev

Browse Source 
* commit '77b7f39f512a34a9af0013cc7e01142192901d67':
  Avoid NPE when ProviderInfo is missing.
This commit is contained in:
Jeff Sharkey
2013-10-04 14:56:18 -07:00
committed by Android Git Automerger
parent 849ef427b8 77b7f39f51
commit 43fac87f2a
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() final ProviderInfo info = context.getPackageManager()
.resolveContentProvider(uri.getAuthority(), PackageManager.GET_META_DATA); .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)) { DocumentsContract.META_DATA_DOCUMENT_PROVIDER)) {
return true; return true;
} }