summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorYuhao Zheng <yuhaozheng@google.com>2013-10-04 11:10:04 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-10-04 11:10:04 -0700
commitfdee07a9df0e1d91e3504b2b5af03d422d47f233 (patch)
treef351067d9b9556f2ead3a4a2236a4dde4e73a52f /api
parentf642163761f578362a627c4f4d4c251e0757cac4 (diff)
parentd82800b890f87dc42939bacd520b85e1fde22328 (diff)
downloadframeworks_base-fdee07a9df0e1d91e3504b2b5af03d422d47f233.zip
frameworks_base-fdee07a9df0e1d91e3504b2b5af03d422d47f233.tar.gz
frameworks_base-fdee07a9df0e1d91e3504b2b5af03d422d47f233.tar.bz2
am d82800b8: am 4ee58568: am f3ca9477: Merge "New Telephony APIs to return MMS UA and UAProfUrl" into klp-dev
* commit 'd82800b890f87dc42939bacd520b85e1fde22328': New Telephony APIs to return MMS UA and UAProfUrl
Diffstat (limited to 'api')
-rw-r--r--api/current.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index 712a424..39b2f65 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -23837,6 +23837,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();