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

Commit e8bdaa9e authored by Nancy Chen's avatar Nancy Chen Committed by Android Git Automerger
Browse files

am 8e0aab7d: Merge "Add public action to open voicemail settings." into mnc-dev 

* commit '8e0aab7d':
  Add public action to open voicemail settings.
parents 3c9f1e7f 8e0aab7d

api/current.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -31123,6 +31123,7 @@ package android.telephony { 
    method public boolean setOperatorBrandOverride(java.lang.String);

    method public boolean setOperatorBrandOverride(java.lang.String);

    method public boolean setPreferredNetworkTypeToGlobal();

    method public boolean setPreferredNetworkTypeToGlobal();

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

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

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

    field public static final int CALL_STATE_IDLE = 0; // 0x0

    field public static final int CALL_STATE_IDLE = 0; // 0x0

api/system-current.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -33386,6 +33386,7 @@ package android.telephony { 
    method public int[] supplyPukReportResult(java.lang.String, java.lang.String);

    method public int[] supplyPukReportResult(java.lang.String, java.lang.String);

    method public void toggleRadioOnOff();

    method public void toggleRadioOnOff();

    method public void updateServiceLocation();

    method public void updateServiceLocation();

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

    field public static final int CALL_STATE_IDLE = 0; // 0x0

    field public static final int CALL_STATE_IDLE = 0; // 0x0

telephony/java/android/telephony/TelephonyManager.java

+7 −0
Original line number Original line Diff line number Diff line
@@ -273,6 +273,13 @@ public class TelephonyManager { 
    public static final String ACTION_EMERGENCY_ASSISTANCE =

    public static final String ACTION_EMERGENCY_ASSISTANCE =

            "android.telephony.action.EMERGENCY_ASSISTANCE";

            "android.telephony.action.EMERGENCY_ASSISTANCE";





    /**

     * Open the voicemail settings activity to make changes to voicemail configuration.

     */

    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)

    public static final String ACTION_CONFIGURE_VOICEMAIL =

            "android.telephony.action.CONFIGURE_VOICEMAIL";



    /**

    /**

     * @hide

     * @hide

     */

     */