diff options
| author | Chiou-Hao Hsu <chsu@codeaurora.org> | 2014-09-10 14:55:13 -0700 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2014-11-04 08:53:37 -0700 |
| commit | fcb751a97ba88c349c41a28d9d65ad2d912d43f9 (patch) | |
| tree | cc66ffaa905519836b47cca1c48c15d436edca92 | |
| parent | 1488d78236da55e2cdb64dd2602589cdbb20bc18 (diff) | |
| download | android_packages_services_Mms-fcb751a97ba88c349c41a28d9d65ad2d912d43f9.tar.gz android_packages_services_Mms-fcb751a97ba88c349c41a28d9d65ad2d912d43f9.tar.bz2 android_packages_services_Mms-fcb751a97ba88c349c41a28d9d65ad2d912d43f9.zip | |
Mms: convert SUB_ID to PHONE_IDstaging/cm-12.0-caf
Change-Id: I021a4cbb5152e3f015b252db315251cfa0e8a46a
| -rw-r--r-- | src/com/android/mms/service/DownloadRequest.java | 4 | ||||
| -rw-r--r-- | src/com/android/mms/service/SendRequest.java | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/com/android/mms/service/DownloadRequest.java b/src/com/android/mms/service/DownloadRequest.java index ae66742..7e3010e 100644 --- a/src/com/android/mms/service/DownloadRequest.java +++ b/src/com/android/mms/service/DownloadRequest.java @@ -38,7 +38,9 @@ import android.os.Binder; import android.os.Bundle; import android.os.UserHandle; import android.provider.Telephony; +import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; + import android.text.TextUtils; import android.util.Log; @@ -134,7 +136,7 @@ public class DownloadRequest extends MmsRequest { if (!TextUtils.isEmpty(mCreator)) { values.put(Telephony.Mms.CREATOR, mCreator); } - values.put(Telephony.Mms.SUB_ID, mSubId); + values.put(Telephony.Mms.PHONE_ID, SubscriptionManager.getPhoneId(mSubId)); if (SqliteWrapper.update( context, context.getContentResolver(), diff --git a/src/com/android/mms/service/SendRequest.java b/src/com/android/mms/service/SendRequest.java index fb596cf..756e891 100644 --- a/src/com/android/mms/service/SendRequest.java +++ b/src/com/android/mms/service/SendRequest.java @@ -39,6 +39,7 @@ import android.os.Bundle; import android.os.UserHandle; import android.provider.Telephony; import android.telephony.SmsManager; +import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; import android.text.TextUtils; import android.util.Log; @@ -122,7 +123,7 @@ public class SendRequest extends MmsRequest { if (!TextUtils.isEmpty(mCreator)) { values.put(Telephony.Mms.CREATOR, mCreator); } - values.put(Telephony.Mms.SUB_ID, mSubId); + values.put(Telephony.Mms.PHONE_ID, SubscriptionManager.getPhoneId(mSubId)); if (SqliteWrapper.update(context, context.getContentResolver(), mMessageUri, values, null/*where*/, null/*selectionArg*/) != 1) { Log.e(MmsService.TAG, "SendRequest.storeInOutbox: failed to update message"); @@ -134,7 +135,7 @@ public class SendRequest extends MmsRequest { // Reset the timestamp values.put(Telephony.Mms.DATE, System.currentTimeMillis() / 1000L); values.put(Telephony.Mms.MESSAGE_BOX, Telephony.Mms.MESSAGE_BOX_OUTBOX); - values.put(Telephony.Mms.SUB_ID, mSubId); + values.put(Telephony.Mms.PHONE_ID, SubscriptionManager.getPhoneId(mSubId)); if (SqliteWrapper.update(context, context.getContentResolver(), mMessageUri, values, null/*where*/, null/*selectionArg*/) != 1) { Log.e(MmsService.TAG, "SendRequest.storeInOutbox: failed to update message"); |