diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2021-04-21 22:33:13 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2021-04-21 22:33:13 +0000 |
| commit | 8e4c0e1e7b0b7c52221b79364fe07f50ad976997 (patch) | |
| tree | 4993185f3231fdcf749838c2fffdc06298fd3ed5 | |
| parent | e0f4b4ad2460d7e6e8d6259077281322e9828997 (diff) | |
| parent | feb72146d453145313159aabb39785e256a9081d (diff) | |
| download | ContactsProvider-8e4c0e1e7b0b7c52221b79364fe07f50ad976997.tar.gz | |
Snap for 7302986 from feb72146d453145313159aabb39785e256a9081d to sc-mainline-release
Change-Id: Ifc23f9466973aa34f19691df65c048d6028c80f2
| -rw-r--r-- | res/values-da/strings.xml | 2 | ||||
| -rw-r--r-- | src/com/android/providers/contacts/SearchIndexManager.java | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml index af92fe79..1b8b54e4 100644 --- a/res/values-da/strings.xml +++ b/res/values-da/strings.xml @@ -26,7 +26,7 @@ <string name="local_invisible_directory" msgid="705244318477396120">"Andre"</string> <string name="voicemail_from_column" msgid="435732568832121444">"Telefonsvarerbesked fra "</string> <string name="debug_dump_title" msgid="4916885724165570279">"Kopiér database med kontakter"</string> - <string name="debug_dump_database_message" msgid="406438635002392290">"Du er ved at 1) lave en kopi af din database, som indeholder alle oplysninger om dine kontakter og alle opkaldslister, til det interne lager, og 2) sende den som mail. Husk at slette kopien, så snart du har kopieret den fra enheden, eller mailen er modtaget."</string> + <string name="debug_dump_database_message" msgid="406438635002392290">"Du er ved at 1) lave en kopi af din database, som indeholder alle oplysninger om dine kontakter og al opkaldshistorik, til det interne lager, og 2) sende den som mail. Husk at slette kopien, så snart du har kopieret den fra enheden, eller mailen er modtaget."</string> <string name="debug_dump_delete_button" msgid="7832879421132026435">"Slet nu"</string> <string name="debug_dump_start_button" msgid="2837506913757600001">"Start"</string> <string name="debug_dump_email_sender_picker" msgid="3534420908672176460">"Vælg et program, for at sende din fil"</string> diff --git a/src/com/android/providers/contacts/SearchIndexManager.java b/src/com/android/providers/contacts/SearchIndexManager.java index e421654c..aeaa0e7d 100644 --- a/src/com/android/providers/contacts/SearchIndexManager.java +++ b/src/com/android/providers/contacts/SearchIndexManager.java @@ -55,7 +55,8 @@ public class SearchIndexManager { private static final int MAX_STRING_BUILDER_SIZE = 1024 * 10; public static final String PROPERTY_SEARCH_INDEX_VERSION = "search_index"; - private static final int SEARCH_INDEX_VERSION = 1; + private static final String ROW_ID_KEY = "rowid"; + private static final int SEARCH_INDEX_VERSION = 2; private static final class ContactIndexQuery { public static final String[] COLUMNS = { @@ -327,7 +328,7 @@ public class SearchIndexManager { // Remove affected search_index rows. final SQLiteDatabase db = mDbHelper.getWritableDatabase(); final int deleted = db.delete(Tables.SEARCH_INDEX, - SearchIndexColumns.CONTACT_ID + " IN (SELECT " + + ROW_ID_KEY + " IN (SELECT " + RawContacts.CONTACT_ID + " FROM " + Tables.RAW_CONTACTS + " WHERE " + rawContactsSelection + @@ -400,6 +401,7 @@ public class SearchIndexManager { mValues.put(SearchIndexColumns.NAME, builder.getName()); mValues.put(SearchIndexColumns.TOKENS, builder.getTokens()); mValues.put(SearchIndexColumns.CONTACT_ID, contactId); + mValues.put(ROW_ID_KEY, contactId); db.insert(Tables.SEARCH_INDEX, null, mValues); } private int getSearchIndexVersion() { |