commit 72e1823a180320294fbc1c30abe2c452cab7ae25
author calvinpan <calvinpan@google.com> Thu Apr 25 17:52:59 2019 +0800
committer Calvin Pan <calvinpan@google.com> Mon Apr 29 02:33:35 2019 +0000
tree 28af7a5e22dc46283080cfad9b1b955428510044
parent 2f64561055b6a0d83b1cab5a117633b14f2c127c

To prevent MMS get the incorrect resource on MSIM device

Get TelephonyManager with subid to prevent getting the incorrect
resource(MMS_CONFIG_USER_AGENT and MMS_CONFIG_UA_PROF_URL) on MSIM
device.

Bug: 131296413
Test: Build pass.
Change-Id: I3c51d6e2882596be6dcf660d6903b2cb3e96a6c9

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);