From 6f51e9624f7372f4dec5fc7661eadf25b5af89df Mon Sep 17 00:00:00 2001 From: calvinpan Date: Thu, 25 Apr 2019 16:18:36 +0800 Subject: [PATCH] Get the resources associated with subid to support MSIM To avoid AP get the incorrect mms_user_agent and mms_user_agent_profile_url in the MSIM device, so get the resource with subscription. Bug: 131296413 Test: Build pass Merged-In: Ib00cfe3640b59db5f971c32741eed999131e67c0 Change-Id: Ib00cfe3640b59db5f971c32741eed999131e67c0 (cherry picked from commit ea6d2b1e1e0f63f5a9ada0c884ac68e66009cd6d) --- telephony/java/android/telephony/TelephonyManager.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 655ac7673e94e..2e37a0725d59c 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -5224,7 +5224,7 @@ public class TelephonyManager { */ public String getMmsUserAgent() { if (mContext == null) return null; - return mContext.getResources().getString( + return SubscriptionManager.getResourcesForSubId(mContext, getSubId()).getString( com.android.internal.R.string.config_mms_user_agent); } @@ -5233,7 +5233,7 @@ public class TelephonyManager { */ public String getMmsUAProfUrl() { if (mContext == null) return null; - return mContext.getResources().getString( + return SubscriptionManager.getResourcesForSubId(mContext, getSubId()).getString( com.android.internal.R.string.config_mms_user_agent_profile_url); }