commit c04324acfabf311a716ab04bc46693054dd4074c
author Amit Mahajan <amitmahajan@google.com> Wed Apr 13 18:42:31 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Apr 13 18:42:31 2016 +0000
tree 524b929fe4d8a3f83670b98f93374bfc5e8c6f41
parent 5d9fcaf0fba8ab30b22bbcb4663e27b38770ec1a
parent 6215a4f6b109479dd0e746bdb32fb17697ea921d

Merge "Add message_body column to raw table." into nyc-dev am: 36379ef
am: 6215a4f

* commit '6215a4f6b109479dd0e746bdb32fb17697ea921d':
  Add message_body column to raw table.

Change-Id: Ic3cde57a6159cd52e4ce31200ef749463cac19b4

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 b64b73f..031759c 100644
--- a/src/com/android/providers/telephony/MmsSmsDatabaseHelper.java
+++ b/src/com/android/providers/telephony/MmsSmsDatabaseHelper.java
@@ -1436,6 +1436,22 @@
             } finally {
                 db.endTransaction();
             }
+            // fall through
+        case 63:
+            if (currentVersion <= 63) {
+                return;
+            }
+
+            db.beginTransaction();
+            try {
+                upgradeDatabaseToVersion64(db);
+                db.setTransactionSuccessful();
+            } catch (Throwable ex) {
+                Log.e(TAG, ex.getMessage(), ex);
+                break;
+            } finally {
+                db.endTransaction();
+            }
 
             return;
         }
@@ -1715,6 +1731,10 @@
         db.execSQL("ALTER TABLE " + SmsProvider.TABLE_RAW +" ADD COLUMN deleted INTEGER DEFAULT 0");
     }
 
+    private void upgradeDatabaseToVersion64(SQLiteDatabase db) {
+        db.execSQL("ALTER TABLE " + SmsProvider.TABLE_RAW +" ADD COLUMN message_body TEXT");
+    }
+
     @Override
     public synchronized SQLiteDatabase getWritableDatabase() {
         SQLiteDatabase db = super.getWritableDatabase();

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

diff --git a/src/com/android/providers/telephony/SmsProvider.java b/src/com/android/providers/telephony/SmsProvider.java
index fae8cd9..7175f24 100644
--- a/src/com/android/providers/telephony/SmsProvider.java
+++ b/src/com/android/providers/telephony/SmsProvider.java
@@ -209,7 +209,7 @@
 
             case SMS_RAW_MESSAGE:
                 // before querying purge old entries with deleted = 1
-                // purgeDeletedMessagesInRawTable(db);
+                purgeDeletedMessagesInRawTable(db);
                 qb.setTables("raw");
                 break;
 
@@ -687,14 +687,14 @@
                 break;
 
             case SMS_RAW_MESSAGE:
-            /*    ContentValues cv = new ContentValues();
+                ContentValues cv = new ContentValues();
                 cv.put("deleted", 1);
                 count = db.update(TABLE_RAW, cv, where, whereArgs);
                 if (Log.isLoggable(TAG, Log.VERBOSE)) {
                     Log.d(TAG, "delete: num rows marked deleted in raw table: " + count);
                 }
                 notifyIfNotDefault = false;
-                break;*/
+                break;
 
             case SMS_RAW_MESSAGE_PERMANENT_DELETE:
                 count = db.delete(TABLE_RAW, where, whereArgs);