Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 114b78bf authored by Yorke Lee's avatar Yorke Lee Committed by Android (Google) Code Review
Browse files

Merge "Changes for TelecomManager API review"

parents f7a61483 0604427a

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -29795,6 +29795,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";

api/system-current.txt

+3 −3
Original line number Diff line number Diff line
@@ -32311,7 +32311,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();
@@ -32328,8 +32329,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();

telecomm/java/android/telecom/TelecomManager.java

+10 −16
Original line number Diff line number Diff line
@@ -531,19 +531,6 @@ public class TelecomManager { 
        return new ArrayList<>();

    }



    /**

     * 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.

     *
@@ -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 {