diff options
author | Yorke Lee <yorkelee@google.com> | 2015-04-14 15:16:59 -0700 |
---|---|---|
committer | Yorke Lee <yorkelee@google.com> | 2015-04-14 17:12:04 -0700 |
commit | 0bce89050a86cd68fd7c32fdf152d96649c88a6a (patch) | |
tree | f97251ee84a35e90192e1ffa8e8620104eae4e6a /api | |
parent | 2287a01bb9fd1d417e376e50d7fad41fd895ad3d (diff) | |
download | frameworks_base-0bce89050a86cd68fd7c32fdf152d96649c88a6a.zip frameworks_base-0bce89050a86cd68fd7c32fdf152d96649c88a6a.tar.gz frameworks_base-0bce89050a86cd68fd7c32fdf152d96649c88a6a.tar.bz2 |
DO NOT MERGE Changes for TelecomManager API review
* clearAccounts -> clearPhoneAccounts
* handleMMi(PhoneAccountHandle, String) -> handleMMi(String, PhoneAccountHandle)
* hasMultipleCallCapableAccounts -> removed
Bug: 20160799
Change-Id: Ifcd26474f04b71aa725299b6016004151b76bc31
Diffstat (limited to 'api')
-rw-r--r-- | api/current.txt | 1 | ||||
-rw-r--r-- | api/system-current.txt | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/api/current.txt b/api/current.txt index acfc72e..96e6f7f 100644 --- a/api/current.txt +++ b/api/current.txt @@ -28332,6 +28332,7 @@ package android.telecom { method public void cancelMissedCallsNotification(); method public android.telecom.PhoneAccount getPhoneAccount(android.telecom.PhoneAccountHandle); method public boolean handleMmi(java.lang.String); + method public boolean handleMmi(java.lang.String, android.telecom.PhoneAccountHandle); method public boolean isInCall(); method public void showInCallScreen(boolean); field public static final java.lang.String ACTION_SHOW_CALL_SETTINGS = "android.telecom.action.SHOW_CALL_SETTINGS"; diff --git a/api/system-current.txt b/api/system-current.txt index e063648..6df0a0b 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -30549,7 +30549,8 @@ package android.telecom { method public void addNewIncomingCall(android.telecom.PhoneAccountHandle, android.os.Bundle); method public void addNewUnknownCall(android.telecom.PhoneAccountHandle, android.os.Bundle); method public void cancelMissedCallsNotification(); - method public void clearAccounts(); + method public deprecated void clearAccounts(); + method public void clearPhoneAccounts(); method public boolean endCall(); method public android.net.Uri getAdnUriForPhoneAccount(android.telecom.PhoneAccountHandle); method public java.util.List<android.telecom.PhoneAccountHandle> getAllPhoneAccountHandles(); @@ -30565,8 +30566,7 @@ package android.telecom { method public java.util.List<android.telecom.PhoneAccountHandle> getPhoneAccountsSupportingScheme(java.lang.String); method public java.util.List<android.telecom.PhoneAccountHandle> getRegisteredConnectionManagers(); method public boolean handleMmi(java.lang.String); - method public boolean handleMmi(android.telecom.PhoneAccountHandle, java.lang.String); - method public boolean hasMultipleCallCapableAccounts(); + method public boolean handleMmi(java.lang.String, android.telecom.PhoneAccountHandle); method public boolean hasVoiceMailNumber(android.telecom.PhoneAccountHandle); method public boolean isInCall(); method public boolean isRinging(); |