commit 2240df729f2c95c085b9c62bccebf16bc19c5671
author Amit Mahajan <amitmahajan@google.com> Mon Mar 28 11:14:54 2016 -0700
committer Amit Mahajan <amitmahajan@google.com> Wed Mar 30 14:07:11 2016 -0700
tree 72c5fc0fb7b9bcd89eafee8f8f87b1ef64caa066
parent 9dbdf2ddfbf6f7b890bca2ae524549ad0791dfcc

Minor changes to SMS de-duping changes.

Incorporating some review comments.

Bug: 27820591
Change-Id: Iec75463ac68ef4af70bc54606bea6a5536de8c8f

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 4d48786..d8b97c5 100644
--- a/src/com/android/providers/telephony/SmsProvider.java
+++ b/src/com/android/providers/telephony/SmsProvider.java
@@ -62,7 +62,7 @@
     private static final int PERSON_ID_COLUMN = 0;
 
     /** Delete any raw messages or message segments marked deleted that are older than an hour. */
-    static final long RAW_MESSAGE_EXPIRE_AGE = (long) (60 * 60 * 1000);
+    static final long RAW_MESSAGE_EXPIRE_AGE_MS = (long) (60 * 60 * 1000);
 
     /**
      * These are the columns that are available when reading SMS
@@ -270,8 +270,8 @@
     }
 
     private void purgeDeletedMessagesInRawTable(SQLiteDatabase db) {
-        long oldTimestamp = System.currentTimeMillis() - RAW_MESSAGE_EXPIRE_AGE;
-        int num = db.delete("raw", "deleted = 1 AND date < " + oldTimestamp, null);
+        long oldTimestamp = System.currentTimeMillis() - RAW_MESSAGE_EXPIRE_AGE_MS;
+        int num = db.delete(TABLE_RAW, "deleted = 1 AND date < " + oldTimestamp, null);
         if (Log.isLoggable(TAG, Log.VERBOSE)) {
             Log.d(TAG, "purgeDeletedMessagesInRawTable: num rows older than " + oldTimestamp +
                     " purged: " + num);
@@ -689,7 +689,7 @@
             case SMS_RAW_MESSAGE:
                 ContentValues cv = new ContentValues();
                 cv.put("deleted", 1);
-                count = db.update("raw", cv, where, whereArgs);
+                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);
                 }
@@ -697,7 +697,7 @@
                 break;
 
             case SMS_RAW_MESSAGE_PERMANENT_DELETE:
-                count = db.delete("raw", where, whereArgs);
+                count = db.delete(TABLE_RAW, where, whereArgs);
                 if (Log.isLoggable(TAG, Log.VERBOSE)) {
                     Log.d(TAG, "delete: num rows permanently deleted in raw table: " + count);
                 }