Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Change hasVoicemailNumber to getVoicemailNumber"

Browse Source
This commit is contained in:
Yorke Lee
2015-04-16 17:05:16 +00:00
committed by Android (Google) Code Review
parent 8d572dd1e2 49e2d46812
commit a22a09666b
4 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

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

2
api/system-current.txt
View File

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

13
telecomm/java/android/telecom/TelecomManager.java
View File

@@ -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;
}
/**

4
telecomm/java/com/android/internal/telecom/ITelecomService.aidl
View File

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