summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author calvinpan <calvinpan@google.com> 2019-04-25 16:18:36 +0800
committer Pengquan Meng <mpq@google.com> 2019-06-03 19:51:21 -0700
commit6f51e9624f7372f4dec5fc7661eadf25b5af89df (patch)
tree1f81175d0c22fb892bd0d2b050b98c86360247a8
parent95ae9c0b370ca9048d16e67c0d11ae54ca84ed7c (diff)
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)
-rw-r--r--telephony/java/android/telephony/TelephonyManager.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index 655ac7673e94..2e37a0725d59 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);
}