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

Merge "Deprecate setVisualVoicemailEnabled isVisualVoicemailEnabled" into oc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-04-14 01:44:01 +00:00
committed by Android (Google) Code Review
parent 4db137b059 d6099178f1
commit ad989b1711
3 changed files with 7 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/system-current.txt
View File

@@ -43683,7 +43683,7 @@ package android.telephony {
method public boolean isSmsCapable();
method public boolean isTtyModeSupported();
method public boolean isVideoCallingEnabled();
method public boolean isVisualVoicemailEnabled(android.telecom.PhoneAccountHandle);
method public deprecated boolean isVisualVoicemailEnabled(android.telecom.PhoneAccountHandle);
method public boolean isVoiceCapable();
method public boolean isVoicemailVibrationEnabled(android.telecom.PhoneAccountHandle);
method public boolean isWorldPhone();
@@ -43700,7 +43700,7 @@ package android.telephony {
method public boolean setPreferredNetworkTypeToGlobal();
method public boolean setRadio(boolean);
method public boolean setRadioPower(boolean);
method public void setVisualVoicemailEnabled(android.telecom.PhoneAccountHandle, boolean);
method public deprecated void setVisualVoicemailEnabled(android.telecom.PhoneAccountHandle, boolean);
method public boolean setVoiceMailNumber(java.lang.String, java.lang.String);
method public void setVoicemailRingtoneUri(android.telecom.PhoneAccountHandle, android.net.Uri);
method public void setVoicemailVibrationEnabled(android.telecom.PhoneAccountHandle, boolean);

25
telephony/java/android/telephony/TelephonyManager.java
View File

@@ -2710,19 +2710,12 @@ public class TelephonyManager {
* @param phoneAccountHandle the phone account to change the client state
* @param enabled the new state of the client
* @hide
* @deprecated Visual voicemail no longer in telephony. {@link VisualVoicemailService} should
* be implemented instead.
*/
@SystemApi
public void setVisualVoicemailEnabled(PhoneAccountHandle phoneAccountHandle, boolean enabled){
try {
ITelephony telephony = getITelephony();
if (telephony != null) {
telephony.setVisualVoicemailEnabled(mContext.getOpPackageName(), phoneAccountHandle,
enabled);
}
} catch (RemoteException ex) {
} catch (NullPointerException ex) {
// This could happen before phone restarts due to crashing
}
}
/**
@@ -2734,19 +2727,11 @@ public class TelephonyManager {
* @param phoneAccountHandle the phone account to check for.
* @return {@code true} when the visual voicemail client is enabled for this client
* @hide
* @deprecated Visual voicemail no longer in telephony. {@link VisualVoicemailService} should
* be implemented instead.
*/
@SystemApi
public boolean isVisualVoicemailEnabled(PhoneAccountHandle phoneAccountHandle){
try {
ITelephony telephony = getITelephony();
if (telephony != null) {
return telephony.isVisualVoicemailEnabled(
mContext.getOpPackageName(), phoneAccountHandle);
}
} catch (RemoteException ex) {
} catch (NullPointerException ex) {
// This could happen before phone restarts due to crashing
}
return false;
}

6
telephony/java/com/android/internal/telephony/ITelephony.aidl
View File

@@ -498,12 +498,6 @@ interface ITelephony {
*/
boolean isConcurrentVoiceAndDataAllowed(int subId);
oneway void setVisualVoicemailEnabled(String callingPackage,
in PhoneAccountHandle accountHandle, boolean enabled);
boolean isVisualVoicemailEnabled(String callingPackage,
in PhoneAccountHandle accountHandle);
String getVisualVoicemailPackageName(String callingPackage, int subId);
// Not oneway, caller needs to make sure the vaule is set before receiving a SMS