Always atomically drop & create search index.

There was a chance the process or the device getting crashed right after the
DROP.
Bug 21925160

Change-Id: I25bfac0d8994644cc3ca39851f5cfcea6f541f37

1 files changed, 12 insertions, 6 deletions

diff --git a/src/com/android/providers/contacts/ContactsDatabaseHelper.java b/src/com/android/providers/contacts/ContactsDatabaseHelper.java
index fc81fa5..aac37ba 100644
--- a/src/com/android/providers/contacts/ContactsDatabaseHelper.java
+++ b/src/com/android/providers/contacts/ContactsDatabaseHelper.java
@@ -1646,16 +1646,22 @@ public class ContactsDatabaseHelper extends SQLiteOpenHelper {
     }
 
     public void createSearchIndexTable(SQLiteDatabase db, boolean rebuildSqliteStats) {
-        db.execSQL("DROP TABLE IF EXISTS " + Tables.SEARCH_INDEX);
-        db.execSQL("CREATE VIRTUAL TABLE " + Tables.SEARCH_INDEX
-                + " USING FTS4 ("
+        db.beginTransaction();
+        try {
+            db.execSQL("DROP TABLE IF EXISTS " + Tables.SEARCH_INDEX);
+            db.execSQL("CREATE VIRTUAL TABLE " + Tables.SEARCH_INDEX
+                    + " USING FTS4 ("
                     + SearchIndexColumns.CONTACT_ID + " INTEGER REFERENCES contacts(_id) NOT NULL,"
                     + SearchIndexColumns.CONTENT + " TEXT, "
                     + SearchIndexColumns.NAME + " TEXT, "
                     + SearchIndexColumns.TOKENS + " TEXT"
-                + ")");
-        if (rebuildSqliteStats) {
-            updateSqliteStats(db);
+                    + ")");
+            if (rebuildSqliteStats) {
+                updateSqliteStats(db);
+            }
+            db.setTransactionSuccessful();
+        } finally {
+            db.endTransaction();
         }
     }