From 167c3a717f0538615a593f946031d0980943b93a Mon Sep 17 00:00:00 2001 From: Yorke Lee Date: Wed, 15 Apr 2015 16:14:22 -0700 Subject: DO NOT MERGE Change hasVoicemailNumber to getVoicemailNumber Bug: 20223485 Change-Id: I293572bb6c32c5084fe684e7cfe7bd2bbfb5443b --- telecomm/java/android/telecom/TelecomManager.java | 13 +++++++------ .../java/com/android/internal/telecom/ITelecomService.aidl | 4 ++-- 2 files changed, 9 insertions(+), 8 deletions(-) (limited to 'telecomm') diff --git a/telecomm/java/android/telecom/TelecomManager.java b/telecomm/java/android/telecom/TelecomManager.java index c73f6c2..2ea84be 100644 --- a/telecomm/java/android/telecom/TelecomManager.java +++ b/telecomm/java/android/telecom/TelecomManager.java @@ -707,20 +707,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; } /** diff --git a/telecomm/java/com/android/internal/telecom/ITelecomService.aidl b/telecomm/java/com/android/internal/telecom/ITelecomService.aidl index d2030f2..35db97f 100644 --- a/telecomm/java/com/android/internal/telecom/ITelecomService.aidl +++ b/telecomm/java/com/android/internal/telecom/ITelecomService.aidl @@ -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 -- cgit v1.1