diff options
| author | 2017-12-13 22:29:36 +0000 | |
|---|---|---|
| committer | 2017-12-13 22:29:36 +0000 | |
| commit | edf53637bdfd98c7e559e88fedb8caaf653d5dd6 (patch) | |
| tree | 506b28c5ea824e59884009f95b4a044614e25c1e | |
| parent | 47f4e2a536c56e2e0e2a81a0cc937e76ac46a617 (diff) | |
| parent | 3d89874bb5720f6a7c97334f92822b046fb3a027 (diff) | |
Merge "Deprecate setVoicemailRingtoneUri and setVoicemailVibrationEnabled" am: 8244ebfc4e am: a02bbdb8d8
am: 3d89874bb5
Change-Id: I6b1882e006a7b708c5979b4970a2ddc9be35f93b
| -rw-r--r-- | api/current.txt | 4 | ||||
| -rw-r--r-- | telephony/java/android/telephony/TelephonyManager.java | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt index 8db25200f8c8..4d685ae4f504 100644 --- a/api/current.txt +++ b/api/current.txt @@ -40890,8 +40890,8 @@ package android.telephony { method public boolean setPreferredNetworkTypeToGlobal(); method public void setVisualVoicemailSmsFilterSettings(android.telephony.VisualVoicemailSmsFilterSettings); 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); + method public deprecated void setVoicemailRingtoneUri(android.telecom.PhoneAccountHandle, android.net.Uri); + method public deprecated void setVoicemailVibrationEnabled(android.telecom.PhoneAccountHandle, boolean); field public static final java.lang.String ACTION_CONFIGURE_VOICEMAIL = "android.telephony.action.CONFIGURE_VOICEMAIL"; field public static final java.lang.String ACTION_PHONE_STATE_CHANGED = "android.intent.action.PHONE_STATE"; field public static final java.lang.String ACTION_RESPOND_VIA_MESSAGE = "android.intent.action.RESPOND_VIA_MESSAGE"; diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 38819ce1d90b..47eb9baf27cb 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -6509,6 +6509,9 @@ public class TelephonyManager { * @param uri The URI for the ringtone to play when receiving a voicemail from a specific * PhoneAccount. * @see #hasCarrierPrivileges + * + * @deprecated Use {@link android.provider.Settings#ACTION_CHANNEL_NOTIFICATION_SETTINGS} + * instead. */ public void setVoicemailRingtoneUri(PhoneAccountHandle phoneAccountHandle, Uri uri) { try { @@ -6551,6 +6554,9 @@ public class TelephonyManager { * @param enabled Whether to enable or disable vibration for voicemail notifications from a * specific PhoneAccount. * @see #hasCarrierPrivileges + * + * @deprecated Use {@link android.provider.Settings#ACTION_CHANNEL_NOTIFICATION_SETTINGS} + * instead. */ public void setVoicemailVibrationEnabled(PhoneAccountHandle phoneAccountHandle, boolean enabled) { |