diff options
| author | Rohit Yengisetty <rohit@cyngn.com> | 2016-01-14 17:49:03 -0800 |
|---|---|---|
| committer | Rohit Yengisetty <rohit@cyngn.com> | 2016-01-14 17:50:33 -0800 |
| commit | f1501f5dd9e704380242e19a6a3d288344c92941 (patch) | |
| tree | 389393c650d5ad49740ed7fdd9a74b2695f48ae0 /src | |
| parent | cf866936d5b061ed31b5dab35b6624e1c05b22bd (diff) | |
| download | android_packages_apps_ContactsCommon-f1501f5dd9e704380242e19a6a3d288344c92941.tar.gz android_packages_apps_ContactsCommon-f1501f5dd9e704380242e19a6a3d288344c92941.tar.bz2 android_packages_apps_ContactsCommon-f1501f5dd9e704380242e19a6a3d288344c92941.zip | |
Ensure non-null encoded uri before attempting to parse
Change-Id: Ief4d9b5b305bfcfa18f173ffa0f21b56584a6a2b
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/contacts/common/model/ContactLoader.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/android/contacts/common/model/ContactLoader.java b/src/com/android/contacts/common/model/ContactLoader.java index fc0bb98f..e27635a7 100644 --- a/src/com/android/contacts/common/model/ContactLoader.java +++ b/src/com/android/contacts/common/model/ContactLoader.java @@ -390,6 +390,10 @@ public class ContactLoader extends AsyncTaskLoader<Contact> { private static Contact loadEncodedContactEntity(Uri uri, Uri lookupUri, EncodedContactEntitySchemaVersion schemaVersion) throws JSONException { + if (lookupUri == null) { + return null; + } + if (schemaVersion == EncodedContactEntitySchemaVersion.ENHANCED_CALLER_META_DATA) { return new ContactBuilder(uri).build(); } else { |