commit 261b3b13b0b950d58865f70592b2223de14869ae
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 084ab4a90caeab4eda4cf36b8614d5b0d24ab444
parent 6c7a94d6fffc0dea287430d9cc4a358752fc83b9
parent ea6d2b1e1e0f63f5a9ada0c884ac68e66009cd6d

Merge "Get the resources associated with subid to support MSIM" into qt-dev

telephony/java/android/telephony/TelephonyManager.java

diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index 4a58d94..6f3e97a 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -5247,7 +5247,7 @@
      */
     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);
     }
 
@@ -5256,7 +5256,7 @@
      */
     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);
     }