diff options
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | api/system-current.txt | 6 | ||||
| -rw-r--r-- | telecomm/java/android/telecom/TelecomManager.java | 26 |
3 files changed, 14 insertions, 19 deletions
diff --git a/api/current.txt b/api/current.txt index dc83f6e..da702db 100644 --- a/api/current.txt +++ b/api/current.txt @@ -29744,6 +29744,7 @@ package android.telecom { method public java.util.List<android.telecom.PhoneAccountHandle> getCallCapablePhoneAccounts(); 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_ACCESSIBILITY_SETTINGS = "android.telecom.action.SHOW_CALL_ACCESSIBILITY_SETTINGS"; diff --git a/api/system-current.txt b/api/system-current.txt index ac80474..e02ed44 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -32258,7 +32258,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(); @@ -32275,8 +32276,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(); diff --git a/telecomm/java/android/telecom/TelecomManager.java b/telecomm/java/android/telecom/TelecomManager.java index ab7864b..642a386 100644 --- a/telecomm/java/android/telecom/TelecomManager.java +++ b/telecomm/java/android/telecom/TelecomManager.java @@ -532,19 +532,6 @@ public class TelecomManager { } /** - * Determine whether the device has more than one account registered that can make and receive - * phone calls. - * - * @return {@code true} if the device has more than one account registered and {@code false} - * otherwise. - * @hide - */ - @SystemApi - public boolean hasMultipleCallCapableAccounts() { - return getCallCapablePhoneAccounts().size() > 1; - } - - /** * Returns a list of all {@link PhoneAccount}s registered for the calling package. * * @return A list of {@code PhoneAccountHandle} objects. @@ -683,6 +670,15 @@ public class TelecomManager { * @hide */ @SystemApi + public void clearPhoneAccounts() { + clearAccounts(); + } + /** + * Remove all Accounts that belong to the calling package from the system. + * @deprecated Use {@link #clearPhoneAccounts()} instead. + * @hide + */ + @SystemApi public void clearAccounts() { try { if (isServiceConnected()) { @@ -1017,10 +1013,8 @@ public class TelecomManager { * @param accountHandle The handle for the account the MMI code should apply to. * @param dialString The digits to dial. * @return True if the digits were processed as an MMI code, false otherwise. - * @hide */ - @SystemApi - public boolean handleMmi(PhoneAccountHandle accountHandle, String dialString) { + public boolean handleMmi(String dialString, PhoneAccountHandle accountHandle) { ITelecomService service = getTelecomService(); if (service != null) { try { |