commit ea6d2b1e1e0f63f5a9ada0c884ac68e66009cd6d
author calvinpan <calvinpan@google.com> Thu Apr 25 16:18:36 2019 +0800
committer Calvin Pan <calvinpan@google.com> Thu Apr 25 10:06:05 2019 +0000
tree 4f9a0c845ab42f26d23cbcb600e7e26f9557b75d
parent 5f82f12cdb188f589bdec3a01b93fcf80a293f76

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
Change-Id: Ib00cfe3640b59db5f971c32741eed999131e67c0

telephony/java/android/telephony/TelephonyManager.java

diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index ccf49c9..96f2d7c 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -5248,7 +5248,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);
     }
 
@@ -5257,7 +5257,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);
     }