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

Commit 3d89874b authored by Ta-wei Yen's avatar Ta-wei Yen Committed by android-build-merger
Browse files

Merge "Deprecate setVoicemailRingtoneUri and setVoicemailVibrationEnabled" am: 8244ebfc 

am: a02bbdb8

Change-Id: Ife2c39388ab647b0e4f5677d920da780b6eb39ca
parents 012739e9 a02bbdb8

api/current.txt

+2 −2
Original line number Original line Diff line number Diff line
@@ -40427,8 +40427,8 @@ package android.telephony { 
    method public boolean setPreferredNetworkTypeToGlobal();

    method public boolean setPreferredNetworkTypeToGlobal();

    method public void setVisualVoicemailSmsFilterSettings(android.telephony.VisualVoicemailSmsFilterSettings);

    method public void setVisualVoicemailSmsFilterSettings(android.telephony.VisualVoicemailSmsFilterSettings);

    method public boolean setVoiceMailNumber(java.lang.String, java.lang.String);

    method public boolean setVoiceMailNumber(java.lang.String, java.lang.String);

    method public void setVoicemailRingtoneUri(android.telecom.PhoneAccountHandle, android.net.Uri);

    method public deprecated void setVoicemailRingtoneUri(android.telecom.PhoneAccountHandle, android.net.Uri);

    method public void setVoicemailVibrationEnabled(android.telecom.PhoneAccountHandle, boolean);

    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_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_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";

    field public static final java.lang.String ACTION_RESPOND_VIA_MESSAGE = "android.intent.action.RESPOND_VIA_MESSAGE";

telephony/java/android/telephony/TelephonyManager.java

+6 −0
Original line number Original line Diff line number Diff line
@@ -6527,6 +6527,9 @@ public class TelephonyManager { 
     * @param uri The URI for the ringtone to play when receiving a voicemail from a specific

     * @param uri The URI for the ringtone to play when receiving a voicemail from a specific

     * PhoneAccount.

     * PhoneAccount.

     * @see #hasCarrierPrivileges

     * @see #hasCarrierPrivileges

     *

     * @deprecated Use {@link android.provider.Settings#ACTION_CHANNEL_NOTIFICATION_SETTINGS}

     * instead.

     */

     */

    public void setVoicemailRingtoneUri(PhoneAccountHandle phoneAccountHandle, Uri uri) {

    public void setVoicemailRingtoneUri(PhoneAccountHandle phoneAccountHandle, Uri uri) {

        try {

        try {
@@ -6569,6 +6572,9 @@ public class TelephonyManager { 
     * @param enabled Whether to enable or disable vibration for voicemail notifications from a

     * @param enabled Whether to enable or disable vibration for voicemail notifications from a

     * specific PhoneAccount.

     * specific PhoneAccount.

     * @see #hasCarrierPrivileges

     * @see #hasCarrierPrivileges

     *

     * @deprecated Use {@link android.provider.Settings#ACTION_CHANNEL_NOTIFICATION_SETTINGS}

     * instead.

     */

     */

    public void setVoicemailVibrationEnabled(PhoneAccountHandle phoneAccountHandle,

    public void setVoicemailVibrationEnabled(PhoneAccountHandle phoneAccountHandle,

            boolean enabled) {

            boolean enabled) {