From d2078bc8c927af17c367bc53b198ad3787b2ff72 Mon Sep 17 00:00:00 2001
From: Yuhao Zheng <yuhaozheng@google.com>
Date: Thu, 3 Oct 2013 14:37:47 -0700
Subject: [PATCH] New Telephony APIs to return MMS UA and UAProfUrl

Added two public APIs under TelephonyManager to return MMS UserAgent and
UAProfUrl strings, for apps that handle SMS/MMS.

Bug: 11054501

Change-Id: Ifa1a64990fa2bf7d0e340d784a9672bf79525338
---
 api/current.txt                                |  2 ++
 core/res/res/values/config.xml                 |  6 ++++++
 core/res/res/values/symbols.xml                |  2 ++
 .../android/telephony/TelephonyManager.java    | 18 ++++++++++++++++++
 4 files changed, 28 insertions(+)

diff --git a/api/current.txt b/api/current.txt
index 2ed9c5890a39c..044bedb22e982 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -23773,6 +23773,8 @@ package android.telephony {
     method public java.lang.String getDeviceSoftwareVersion();
     method public java.lang.String getGroupIdLevel1();
     method public java.lang.String getLine1Number();
+    method public java.lang.String getMmsUAProfUrl();
+    method public java.lang.String getMmsUserAgent();
     method public java.util.List<android.telephony.NeighboringCellInfo> getNeighboringCellInfo();
     method public java.lang.String getNetworkCountryIso();
     method public java.lang.String getNetworkOperator();
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index e39fd2a5be4f4..1ddf2019cfdc9 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -961,6 +961,12 @@
          If false, Content-disposition fragments are ignored -->
     <bool name="config_mms_content_disposition_support">true</bool>
 
+    <!-- MMS user agent string -->
+    <string name="config_mms_user_agent" translatable="false"></string>
+
+    <!-- MMS user agent prolfile url -->
+    <string name="config_mms_user_agent_profile_url" translatable="false"></string>
+
     <!-- National Language Identifier codes for the following two config items.
          (from 3GPP TS 23.038 V9.1.1 Table 6.2.1.2.4.1):
           0  - reserved
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index d483fe04f30ff..a541995967751 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -469,6 +469,8 @@
   <java-symbol type="string" name="chooseActivity" />
   <java-symbol type="string" name="config_default_dns_server" />
   <java-symbol type="string" name="config_ethernet_iface_regex" />
+  <java-symbol type="string" name="config_mms_user_agent" />
+  <java-symbol type="string" name="config_mms_user_agent_profile_url" />
   <java-symbol type="string" name="config_ntpServer" />
   <java-symbol type="string" name="config_tether_apndata" />
   <java-symbol type="string" name="config_useragentprofile_url" />
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index 7d8b64fe014c5..ea0d220deb9dd 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -1400,4 +1400,22 @@ public class TelephonyManager {
         } catch (NullPointerException ex) {
         }
     }
+
+    /**
+     * Returns the MMS user agent.
+     */
+    public String getMmsUserAgent() {
+        if (mContext == null) return null;
+        return mContext.getResources().getString(
+                com.android.internal.R.string.config_mms_user_agent);
+    }
+
+    /**
+     * Returns the MMS user agent profile URL.
+     */
+    public String getMmsUAProfUrl() {
+        if (mContext == null) return null;
+        return mContext.getResources().getString(
+                com.android.internal.R.string.config_mms_user_agent_profile_url);
+    }
 }