diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-04-20 09:11:37 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-04-20 09:11:37 -0700 |
| commit | 5ce379e1aa567024cf6c7a51e387f990d5b22327 (patch) | |
| tree | fd48e69a93aacf1cbf8c22e7e13c55d86152fe20 | |
| parent | 7f7817c31c6de73b155f767d0776f1275881137c (diff) | |
| parent | b1ebaacfdf6ed5133c99ce5bbc910b816e0fcd1f (diff) | |
| download | android_packages_providers_TelephonyProvider-caf/cm-12.1.tar.gz android_packages_providers_TelephonyProvider-caf/cm-12.1.tar.bz2 android_packages_providers_TelephonyProvider-caf/cm-12.1.zip | |
Merge "TelephonyProvider: Can not display SMS in USIM card."caf/cm-12.1
| -rw-r--r-- | AndroidManifest.xml | 1 | ||||
| -rwxr-xr-x | src/com/android/providers/telephony/SmsProvider.java | 34 |
2 files changed, 33 insertions, 2 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 423440b..0f82511 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -14,6 +14,7 @@ limitations under the License. --> + <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.android.providers.telephony" coreApp="true" diff --git a/src/com/android/providers/telephony/SmsProvider.java b/src/com/android/providers/telephony/SmsProvider.java index 29e7e75..134c1c8 100755 --- a/src/com/android/providers/telephony/SmsProvider.java +++ b/src/com/android/providers/telephony/SmsProvider.java @@ -115,7 +115,22 @@ public class SmsProvider extends ContentProvider { "locked", // Always 0 (false). "error_code", // Always 0 "_id", - "phone_id" + "phone_id", + //RCS column + "rcs_path" , + "rcs_thumb_path" , + "rcs_msg_type" , + "rcs_id", + "rcs_burn_flag", + "rcs_is_burn", + "rcs_msg_state", + "rcs_is_download", + "rcs_mime_type", + "favourite", + "rcs_file_size", + "rcs_play_time", + "rcs_message_id", + "rcs_chat_type" }; @Override @@ -299,7 +314,7 @@ public class SmsProvider extends ContentProvider { type = Sms.MESSAGE_TYPE_OUTBOX; break; } - Object[] row = new Object[14]; + Object[] row = new Object[28]; row[0] = message.getServiceCenterAddress(); row[1] = (type == Sms.MESSAGE_TYPE_INBOX) ? message.getDisplayOriginatingAddress() @@ -316,6 +331,21 @@ public class SmsProvider extends ContentProvider { row[11] = 0; // error_code row[12] = id; row[13] = phoneId; + //RCS COLUMN default values + row[14] = null; + row[15] = null; + row[16] = -1; + row[17] = -1; + row[18] = -1; + row[19] = null; + row[20] = null; + row[21] = 0; + row[22] = null; + row[23] = 0; + row[24] = 0; + row[25] = 0; + row[26] = null; + row[27] = null; return row; } |