diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2013-10-04 14:56:18 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-04 14:56:18 -0700 |
| commit | 43fac87f2a8f4843614a5784b830801a90f30150 (patch) | |
| tree | b5cf8d5772e15477f90772e6871527bb01e633ab /core | |
| parent | 849ef427b804c3d308e2d74eebd64e19144ef976 (diff) | |
| parent | 77b7f39f512a34a9af0013cc7e01142192901d67 (diff) | |
| download | frameworks_base-43fac87f2a8f4843614a5784b830801a90f30150.zip frameworks_base-43fac87f2a8f4843614a5784b830801a90f30150.tar.gz frameworks_base-43fac87f2a8f4843614a5784b830801a90f30150.tar.bz2 | |
am 77b7f39f: am fc141ef2: Merge "Avoid NPE when ProviderInfo is missing." into klp-dev
* commit '77b7f39f512a34a9af0013cc7e01142192901d67':
Avoid NPE when ProviderInfo is missing.
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/provider/DocumentsContract.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/provider/DocumentsContract.java b/core/java/android/provider/DocumentsContract.java index 8bf6e4f..631a8d4 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; } |