Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 302b8e8c authored by Chen Xu's avatar Chen Xu Committed by android-build-merger
Browse files

Merge "Get the resources associated with subid to support MSIM" 

am: cdbb700f

Change-Id: I72a04a209bee67c37d4349ca6638f443718b3693
parents f4229196 cdbb700f

telephony/java/android/telephony/TelephonyManager.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -5224,7 +5224,7 @@ public class TelephonyManager { 
     */

     */

    public String getMmsUserAgent() {

    public String getMmsUserAgent() {

        if (mContext == null) return null;

        if (mContext == null) return null;

        return mContext.getResources().getString(

        return SubscriptionManager.getResourcesForSubId(mContext, getSubId()).getString(

                com.android.internal.R.string.config_mms_user_agent);

                com.android.internal.R.string.config_mms_user_agent);

    }

    }
@@ -5233,7 +5233,7 @@ public class TelephonyManager { 
     */

     */

    public String getMmsUAProfUrl() {

    public String getMmsUAProfUrl() {

        if (mContext == null) return null;

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

                com.android.internal.R.string.config_mms_user_agent_profile_url);

    }

    }