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

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

Merge "Change hasVoicemailNumber to getVoicemailNumber"

parents 8d572dd1 49e2d468

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -30399,9 +30399,9 @@ package android.telecom { 
    method public java.lang.String getLine1Number(android.telecom.PhoneAccountHandle);

    method public android.telecom.PhoneAccount getPhoneAccount(android.telecom.PhoneAccountHandle);

    method public android.telecom.PhoneAccountHandle getSimCallManager();

    method public java.lang.String getVoiceMailNumber(android.telecom.PhoneAccountHandle);

    method public boolean handleMmi(java.lang.String);

    method public boolean handleMmi(java.lang.String, android.telecom.PhoneAccountHandle);

    method public boolean hasVoiceMailNumber(android.telecom.PhoneAccountHandle);

    method public boolean isInCall();

    method public boolean isVoiceMailNumber(android.telecom.PhoneAccountHandle, java.lang.String);

    method public void registerPhoneAccount(android.telecom.PhoneAccount);

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -32514,9 +32514,9 @@ 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 android.telecom.PhoneAccountHandle getSimCallManager();

    method public java.lang.String getVoiceMailNumber(android.telecom.PhoneAccountHandle);

    method public boolean handleMmi(java.lang.String);

    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();

    method public boolean isTtySupported();

telecomm/java/android/telecom/TelecomManager.java

+7 −6
Original line number Diff line number Diff line
@@ -720,20 +720,21 @@ public class TelecomManager { 
    }



    /**

     * Return whether a given phone account has a voicemail number configured.

     * Return the voicemail number for a given phone account.

     *

     * @param accountHandle The handle for the account to check for a voicemail number.

     * @return {@code true} If the given phone account has a voicemail number.

     * @param accountHandle The handle for the phone account.

     * @return The voicemail number for the phone account, and {@code null} if one has not been

     *         configured.

     */

    public boolean hasVoiceMailNumber(PhoneAccountHandle accountHandle) {

    public String getVoiceMailNumber(PhoneAccountHandle accountHandle) {

        try {

            if (isServiceConnected()) {

                return getTelecomService().hasVoiceMailNumber(accountHandle);

                return getTelecomService().getVoiceMailNumber(accountHandle);

            }

        } catch (RemoteException e) {

            Log.e(TAG, "RemoteException calling ITelecomService#hasVoiceMailNumber.", e);

        }

        return false;

        return null;

    }



    /**

telecomm/java/com/android/internal/telecom/ITelecomService.aidl

+2 −2
Original line number Diff line number Diff line
@@ -121,9 +121,9 @@ interface ITelecomService { 
    boolean isVoiceMailNumber(in PhoneAccountHandle accountHandle, String number);



    /**

     * @see TelecomServiceImpl#hasVoiceMailNumber

     * @see TelecomServiceImpl#getVoiceMailNumber

     */

    boolean hasVoiceMailNumber(in PhoneAccountHandle accountHandle);

    String getVoiceMailNumber(in PhoneAccountHandle accountHandle);



    /**

     * @see TelecomServiceImpl#getLine1Number