diff options
| author | Andrew Lee <anwlee@google.com> | 2015-03-06 01:05:07 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-03-06 01:05:08 +0000 |
| commit | 2b84e98e69ec915586963a1f2f3e55bacf210061 (patch) | |
| tree | 2a8954d280de89aa1680170122c3ee436ac051bb /api | |
| parent | 1c20d3cf3fe55ebfeb2c4f5cfaff47ed1112e7aa (diff) | |
| parent | 67fc92bd444e4d8eee0aa7703980aff9185ea1bd (diff) | |
| download | frameworks_base-2b84e98e69ec915586963a1f2f3e55bacf210061.zip frameworks_base-2b84e98e69ec915586963a1f2f3e55bacf210061.tar.gz frameworks_base-2b84e98e69ec915586963a1f2f3e55bacf210061.tar.bz2 | |
Merge "Add methods for device telephony configs."
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | api/system-current.txt | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index c748577..c36d03f 100644 --- a/api/current.txt +++ b/api/current.txt @@ -29331,6 +29331,7 @@ package android.telephony { } public class TelephonyManager { + method public boolean canChangeDtmfToneLength(); method public java.util.List<android.telephony.CellInfo> getAllCellInfo(); method public int getCallState(); method public android.telephony.CellLocation getCellLocation(); @@ -29366,6 +29367,7 @@ package android.telephony { method public boolean isNetworkRoaming(); method public boolean isSmsCapable(); method public boolean isVoiceCapable(); + method public boolean isWorldPhone(); method public void listen(android.telephony.PhoneStateListener, int); method public java.lang.String sendEnvelopeWithStatus(java.lang.String); method public boolean setLine1NumberForDisplay(java.lang.String, java.lang.String); diff --git a/api/system-current.txt b/api/system-current.txt index 2e980de..52098e6 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -31458,6 +31458,7 @@ package android.telephony { public class TelephonyManager { method public void answerRingingCall(); method public void call(java.lang.String, java.lang.String); + method public boolean canChangeDtmfToneLength(); method public int checkCarrierPrivilegesForPackage(java.lang.String); method public void dial(java.lang.String); method public boolean disableDataConnectivity(); @@ -31517,6 +31518,7 @@ package android.telephony { method public boolean isSmsCapable(); method public boolean isVideoCallingEnabled(); method public boolean isVoiceCapable(); + method public boolean isWorldPhone(); method public void listen(android.telephony.PhoneStateListener, int); method public boolean needsOtaServiceProvisioning(); method public java.lang.String sendEnvelopeWithStatus(java.lang.String); |