Mms: convert SUB_ID to PHONE_ID
Change-Id: I021a4cbb5152e3f015b252db315251cfa0e8a46a
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.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 @@
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.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 @@
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 @@
// 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");