diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2013-10-04 21:49:06 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-10-04 21:49:07 +0000 |
| commit | fc141ef20bf871e925fbbbe4bb9af64c67033246 (patch) | |
| tree | 2d74bd157e3a6509615f000daf948cc915dc4cea /core/java/android | |
| parent | 0ab7c883d51288f62ba605d5a797abd71ad68626 (diff) | |
| parent | 9095c5a8236957e677b2b13e42aad71a5b185e4d (diff) | |
Merge "Avoid NPE when ProviderInfo is missing." into klp-dev
Diffstat (limited to 'core/java/android')
| -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 8bf6e4faf686..631a8d41c064 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; } |