commit 80fe2a353931af12f2d5caaa779dee7122d12e38
author Amit Mahajan <amitmahajan@google.com> Sat Nov 12 00:17:13 2016 +0000
committer android-build-merger <android-build-merger@google.com> Sat Nov 12 00:17:13 2016 +0000
tree c5bc8b58b98dae9a36528d01274ad966ccaef2aa
parent 91e8f5eea8806ed7f914db86107bc06a87f5d70d
parent 8ababf51d3d2d3920e405c7437b2b4d9ecd135a2

Merge "Handle exception upgrading to db version 65 gracefully." am: a615f3daa0 am: 09c788dab5
am: 8ababf51d3

Change-Id: I8148abd3bf2edbdae1d60469736e5da90505847c

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