commit 9f67590d1b60e0db3fcd2e2ad069d1d703154a9f
author Calvin Pan <calvinpan@google.com> Thu May 23 13:15:31 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu May 23 13:15:31 2019 +0000
tree 1b5846c83db0350ff446b0b1d0cf0134f6dd1503
parent 9c292c6fc63c41d6d6778607ca109e7ed77d62b9
parent 72e1823a180320294fbc1c30abe2c452cab7ae25

Merge "To prevent MMS get the incorrect resource on MSIM device" into qt-dev

src/com/android/mms/service/MmsRequest.java

diff --git a/src/com/android/mms/service/MmsRequest.java b/src/com/android/mms/service/MmsRequest.java
index ec8b334..8363686 100644
--- a/src/com/android/mms/service/MmsRequest.java
+++ b/src/com/android/mms/service/MmsRequest.java
@@ -106,8 +106,9 @@
                 mMmsConfig = config;
                 // TODO: Make MmsConfigManager authoritative for user agent and don't consult
                 // TelephonyManager.
-                final TelephonyManager telephonyManager =
-                        (TelephonyManager) mContext.getSystemService(Context.TELEPHONY_SERVICE);
+                final TelephonyManager telephonyManager = ((TelephonyManager) mContext
+                        .getSystemService(Context.TELEPHONY_SERVICE))
+                        .createForSubscriptionId(mSubId);
                 final String userAgent = telephonyManager.getMmsUserAgent();
                 if (!TextUtils.isEmpty(userAgent)) {
                     config.putString(SmsManager.MMS_CONFIG_USER_AGENT, userAgent);