commit 3b020159fbe6e2000635649b5e39f1d892beae3b
author Amit Mahajan <amitmahajan@google.com> Mon Nov 07 17:04:59 2016 -0800
committer gitbuildkicker <android-build@google.com> Wed Nov 09 16:25:21 2016 -0800
tree 6cf24ace3ae83bc4a0f1f934adcc03b88b15a6c8
parent 2f3ef20b5be69aa32b5f2e57c33de1461606cbbb

Handle exception upgrading to db version 65 gracefully.

Test: Upgrade build on a device from nyc-mr1-dev to master.

Bug: 32547917
Change-Id: If970c33fb160bff68dc28082b5b137803cf5ae07
(cherry picked from commit c32d45537c329fcd099fb97a8c343ba687c34846)

src/com/android/providers/telephony/MmsSmsDatabaseHelper.java

diff --git a/src/com/android/providers/telephony/MmsSmsDatabaseHelper.java b/src/com/android/providers/telephony/MmsSmsDatabaseHelper.java
index 118eaeb..45d4f01 100644
--- a/src/com/android/providers/telephony/MmsSmsDatabaseHelper.java
+++ b/src/com/android/providers/telephony/MmsSmsDatabaseHelper.java
@@ -23,6 +23,7 @@
 import android.content.IntentFilter;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteException;
 import android.database.sqlite.SQLiteOpenHelper;
 import android.os.storage.StorageManager;
 import android.provider.BaseColumns;
@@ -1734,7 +1735,17 @@
     }
 
     private void upgradeDatabaseToVersion65(SQLiteDatabase db) {
-        db.execSQL("ALTER TABLE " + SmsProvider.TABLE_RAW +" ADD COLUMN message_body TEXT");
+        // aosp and internal code diverged at version 63. Aosp did createThreadIdDateIndex() on
+        // upgrading to 63, whereas internal (nyc) added column 'deleted'. A device upgrading from
+        // nyc will have columns deleted and message_body in raw table with version 64, but not
+        // createThreadIdDateIndex()
+        try {
+            db.execSQL("ALTER TABLE " + SmsProvider.TABLE_RAW + " ADD COLUMN message_body TEXT");
+        } catch (SQLiteException e) {
+            Log.w(TAG, "[upgradeDatabaseToVersion65] Exception adding column message_body; " +
+                    "trying createThreadIdDateIndex() instead: " + e);
+            createThreadIdDateIndex(db);
+        }
     }
 
     @Override