diff options
| author | Jay Shrauner <shrauner@google.com> | 2015-03-23 20:56:30 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-03-23 20:56:30 +0000 |
| commit | 2ded4cc7b214d7cddee9d3130744400fcb8cc1f0 (patch) | |
| tree | 1c420ed5f36bb27fcb6fb182d61fb07b8c3e1b9c /src/com | |
| parent | 4ba8c1bfd878942b1c8115cdbe6d08a243cd6505 (diff) | |
| parent | 09e08ac8c9352f42003d2cd3a510bea96244ae0a (diff) | |
| download | packages_providers_ContactsProvider-2ded4cc7b214d7cddee9d3130744400fcb8cc1f0.zip packages_providers_ContactsProvider-2ded4cc7b214d7cddee9d3130744400fcb8cc1f0.tar.gz packages_providers_ContactsProvider-2ded4cc7b214d7cddee9d3130744400fcb8cc1f0.tar.bz2 | |
Merge "Protect against null lookup uri"
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/providers/contacts/GlobalSearchSupport.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/providers/contacts/GlobalSearchSupport.java b/src/com/android/providers/contacts/GlobalSearchSupport.java index 6ccbd38..20307d4 100644 --- a/src/com/android/providers/contacts/GlobalSearchSupport.java +++ b/src/com/android/providers/contacts/GlobalSearchSupport.java @@ -244,8 +244,9 @@ public class GlobalSearchSupport { String.valueOf(SNIPPET_START_MATCH), String.valueOf(SNIPPET_END_MATCH), SNIPPET_ELLIPSIS, SNIPPET_MAX_TOKENS, false); } + sb.append(" WHERE " + Contacts.LOOKUP_KEY + " IS NOT NULL"); if (selection != null) { - sb.append(" WHERE ").append(selection); + sb.append(" AND ").append(selection); } if (limit != null) { sb.append(" LIMIT " + limit); |