Merge cherrypicks of [7773043, 7773102, 7772814, 7772986, 7772988, 7772990] into qt-release (a7639afb) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/TelephonyManager.java

+18 −6

Original line number	Diff line number	Diff line
		@@ -5356,18 +5356,30 @@ public class TelephonyManager {
		* Returns the MMS user agent.
		*/
		public String getMmsUserAgent() {
		if (mContext == null) return null;
		return SubscriptionManager.getResourcesForSubId(mContext, getSubId()).getString(
		com.android.internal.R.string.config_mms_user_agent);
		try {
		ITelephony telephony = getITelephony();
		if (telephony != null) {
		return telephony.getMmsUserAgent(getSubId());
		}
		} catch (RemoteException ex) {
		} catch (NullPointerException ex) {
		}
		return null;
		}

		/**
		* Returns the MMS user agent profile URL.
		*/
		public String getMmsUAProfUrl() {
		if (mContext == null) return null;
		return SubscriptionManager.getResourcesForSubId(mContext, getSubId()).getString(
		com.android.internal.R.string.config_mms_user_agent_profile_url);
		try {
		ITelephony telephony = getITelephony();
		if (telephony != null) {
		return telephony.getMmsUAProfUrl(getSubId());
		}
		} catch (RemoteException ex) {
		} catch (NullPointerException ex) {
		}
		return null;
		}

		/**

+10 −0

Original line number	Diff line number	Diff line
		@@ -1986,4 +1986,14 @@ interface ITelephony {
		* outgoing SmsManager operation.
		*/
		oneway void enqueueSmsPickResult(String callingPackage, IIntegerConsumer subIdResult);

		/**
		* Returns the MMS user agent.
		*/
		String getMmsUserAgent(int subId);

		/**
		* Returns the MMS user agent profile URL.
		*/
		String getMmsUAProfUrl(int subId);
		}