diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2013-10-04 17:35:54 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-04 17:35:54 -0700 |
| commit | 0841c51696680da729c5500e0c341fd3ff82d847 (patch) | |
| tree | 3ead08c7ff3ad16dc773d92db79651d64dd539b4 /core | |
| parent | 1ec1d556336486941556023c0ec038706998bf0a (diff) | |
| parent | 43fac87f2a8f4843614a5784b830801a90f30150 (diff) | |
| download | frameworks_base-0841c51696680da729c5500e0c341fd3ff82d847.zip frameworks_base-0841c51696680da729c5500e0c341fd3ff82d847.tar.gz frameworks_base-0841c51696680da729c5500e0c341fd3ff82d847.tar.bz2 | |
am 43fac87f: am 77b7f39f: am fc141ef2: Merge "Avoid NPE when ProviderInfo is missing." into klp-dev
* commit '43fac87f2a8f4843614a5784b830801a90f30150':
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; } |