summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2015-03-05 20:20:55 -0700
committerLinux Build Service Account <lnxbuild@localhost>2015-03-05 20:20:55 -0700
commit2acbdba01c317fc7d74cee20784da16d1d36fabc (patch)
treee956b311d49601b2de66403d629a618f74541a77
parentb0322d1c750bac1248071deb0c0e87e03afa9e31 (diff)
parentd4707193513ec92d6d1f5177a8572f4fbc318233 (diff)
downloadandroid_packages_providers_TelephonyProvider-2acbdba01c317fc7d74cee20784da16d1d36fabc.tar.gz
android_packages_providers_TelephonyProvider-2acbdba01c317fc7d74cee20784da16d1d36fabc.tar.bz2
android_packages_providers_TelephonyProvider-2acbdba01c317fc7d74cee20784da16d1d36fabc.zip
Merge d4707193513ec92d6d1f5177a8572f4fbc318233 on remote branch
Change-Id: I51221b8ff8feb11ebb7dc2b03b4ab2df5ff31950
-rw-r--r--src/com/android/providers/telephony/MmsSmsDatabaseHelper.java5
-rw-r--r--src/com/android/providers/telephony/MmsSmsProvider.java2
2 files changed, 4 insertions, 3 deletions
diff --git a/src/com/android/providers/telephony/MmsSmsDatabaseHelper.java b/src/com/android/providers/telephony/MmsSmsDatabaseHelper.java
index 29afe50..0b6ee9c 100644
--- a/src/com/android/providers/telephony/MmsSmsDatabaseHelper.java
+++ b/src/com/android/providers/telephony/MmsSmsDatabaseHelper.java
@@ -853,7 +853,7 @@ public class MmsSmsDatabaseHelper extends SQLiteOpenHelper {
"rcs_file_transfer_ext TEXT," +
"rcs_file_transfer_id TEXT, " +
"rcs_file_icon TEXT, " +
- "rcs_burn_flag INTEGER, " +
+ "rcs_burn_flag INTEGER DEFAULT -1, " +
"rcs_barcycle INTEGER, " +
"rcs_header TEXT, " +
"is_rcs INTEGER DEFAULT -1," +
@@ -865,7 +865,8 @@ public class MmsSmsDatabaseHelper extends SQLiteOpenHelper {
"rcs_file_size INTEGER DEFAULT 0 , "+
"rcs_id INTEGER DEFAULT -1, "+
"rcs_thumb_path TEXT, " +
- "rcs_burn_body TEXT" +
+ "rcs_burn_body TEXT, " +
+ "rcs_nmsg_state TEXT " +
");");
/**
diff --git a/src/com/android/providers/telephony/MmsSmsProvider.java b/src/com/android/providers/telephony/MmsSmsProvider.java
index 06b4ef3..76f105a 100644
--- a/src/com/android/providers/telephony/MmsSmsProvider.java
+++ b/src/com/android/providers/telephony/MmsSmsProvider.java
@@ -164,7 +164,7 @@ public class MmsSmsProvider extends ContentProvider {
"service_center", "status", "subject", "type", "error_code", "priority", "rcs_path", "rcs_thumb_path", "is_rcs",
"rcs_mime_type", "rcs_msg_type", "rcs_chat_type", "favourite", "rcs_is_burn", "rcs_id",
"rcs_msg_state", "rcs_burn_flag", "rcs_is_download", "rcs_file_size", "rcs_play_time",
- "rcs_burn_body","rcs_message_id" };
+ "rcs_burn_body","rcs_message_id", "rcs_nmsg_state" };
// These are all the columns that appear in the "threads" table.
private static final String[] THREADS_COLUMNS = {