merge in nyc-release history after reset to nyc-dev
diff --git a/src/com/android/providers/telephony/SmsProvider.java b/src/com/android/providers/telephony/SmsProvider.java
index e2da601..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
@@ -209,7 +209,7 @@
case SMS_RAW_MESSAGE:
// before querying purge old entries with deleted = 1
- // purgeDeletedMessagesInRawTable(db);
+ purgeDeletedMessagesInRawTable(db);
qb.setTables("raw");
break;
@@ -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);
@@ -687,17 +687,17 @@
break;
case SMS_RAW_MESSAGE:
- /* ContentValues cv = new ContentValues();
+ 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);
}
notifyIfNotDefault = false;
- break;*/
+ 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);
}