Merge "skip permission check for TelephonyManager API getMmsUserAgent"

telephony/java/android/telephony/TelephonyManager.java

@@ -5223,18 +5223,30 @@ public class TelephonyManager {
      * Returns the MMS user agent.
      */
     public String getMmsUserAgent() {
-        if (mContext == null) return null;
+        try {
-        return SubscriptionManager.getResourcesForSubId(mContext, getSubId()).getString(
+            ITelephony telephony = getITelephony();
-                com.android.internal.R.string.config_mms_user_agent);
+            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;
+        try {
-        return SubscriptionManager.getResourcesForSubId(mContext, getSubId()).getString(
+            ITelephony telephony = getITelephony();
-                com.android.internal.R.string.config_mms_user_agent_profile_url);
+            if (telephony != null) {
+                return telephony.getMmsUAProfUrl(getSubId());
+            }
+        } catch (RemoteException ex) {
+        } catch (NullPointerException ex) {
+        }
+        return null;
     }
 
     /**

telephony/java/com/android/internal/telephony/ITelephony.aidl

@@ -1973,4 +1973,14 @@ interface ITelephony {
     boolean isDataEnabledForApn(int apnType, int subId, String callingPackage);
 
     boolean isApnMetered(int apnType, int subId);
+
+    /**
+     * Returns the MMS user agent.
+     */
+    String getMmsUserAgent(int subId);
+
+    /**
+     * Returns the MMS user agent profile URL.
+     */
+    String getMmsUAProfUrl(int subId);
 }