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

Commit 0bce8905 authored by Yorke Lee's avatar Yorke Lee
Browse files

DO NOT MERGE Changes for TelecomManager API review 

* clearAccounts -> clearPhoneAccounts
* handleMMi(PhoneAccountHandle, String) -> handleMMi(String, PhoneAccountHandle)
* hasMultipleCallCapableAccounts -> removed
Bug: 20160799

Change-Id: Ifcd26474f04b71aa725299b6016004151b76bc31
parent 2287a01b

api/current.txt

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

api/system-current.txt

+3 −3
Original line number Diff line number Diff line
@@ -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();

telecomm/java/android/telecom/TelecomManager.java

+10 −16
Original line number Diff line number Diff line
@@ -520,19 +520,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.

     *
@@ -672,6 +659,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()) {
@@ -1006,10 +1002,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 {