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

Commit a4f9ecf8 authored by Bryce Lee's avatar Bryce Lee Committed by Android Git Automerger
Browse files

am 2c230a0a: am 5d1c34f5: Merge "Add actions and extras for custom voicemail... 

am 2c230a0a: am 5d1c34f5: Merge "Add actions and extras for custom voicemail notification handling." into cw-e-dev

* commit '2c230a0a':
  Add actions and extras for custom voicemail notification handling.
parents e56287ed 2c230a0a

api/system-current.txt

+5 −0
Original line number Diff line number Diff line
@@ -33428,6 +33428,7 @@ package android.telephony { 
    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";

    field public static final java.lang.String ACTION_SHOW_VOICEMAIL_NOTIFICATION = "android.telephony.action.SHOW_VOICEMAIL_NOTIFICATION";

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

    field public static final int CALL_STATE_OFFHOOK = 2; // 0x2

    field public static final int CALL_STATE_RINGING = 1; // 0x1
@@ -33444,11 +33445,15 @@ package android.telephony { 
    field public static final int DATA_CONNECTING = 1; // 0x1

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

    field public static final int DATA_SUSPENDED = 3; // 0x3

    field public static final java.lang.String EXTRA_CALL_VOICEMAIL_INTENT = "android.telephony.extra.CALL_VOICEMAIL_INTENT";

    field public static final java.lang.String EXTRA_INCOMING_NUMBER = "incoming_number";

    field public static final java.lang.String EXTRA_LAUNCH_VOICEMAIL_SETTINGS_INTENT = "android.telephony.extra.LAUNCH_VOICEMAIL_SETTINGS_INTENT";

    field public static final java.lang.String EXTRA_NOTIFICATION_COUNT = "android.telephony.extra.NOTIFICATION_COUNT";

    field public static final java.lang.String EXTRA_STATE = "state";

    field public static final java.lang.String EXTRA_STATE_IDLE;

    field public static final java.lang.String EXTRA_STATE_OFFHOOK;

    field public static final java.lang.String EXTRA_STATE_RINGING;

    field public static final java.lang.String EXTRA_VOICEMAIL_NUMBER = "android.telephony.extra.VOICEMAIL_NUMBER";

    field public static final int NETWORK_TYPE_1xRTT = 7; // 0x7

    field public static final int NETWORK_TYPE_CDMA = 4; // 0x4

    field public static final int NETWORK_TYPE_EDGE = 2; // 0x2

telephony/java/android/telephony/TelephonyManager.java

+40 −0
Original line number Diff line number Diff line
@@ -601,6 +601,46 @@ public class TelephonyManager { 
     */

    public static final String EXTRA_DATA_FAILURE_CAUSE = PhoneConstants.DATA_FAILURE_CAUSE_KEY;



    /**

     * Broadcast intent action for letting custom component know to show voicemail notification.

     * @hide

     */

    @SystemApi

    public static final String ACTION_SHOW_VOICEMAIL_NOTIFICATION =

            "android.telephony.action.SHOW_VOICEMAIL_NOTIFICATION";



    /**

     * The number of voice messages associated with the notification.

     * @hide

     */

    @SystemApi

    public static final String EXTRA_NOTIFICATION_COUNT =

            "android.telephony.extra.NOTIFICATION_COUNT";



    /**

     * The voicemail number.

     * @hide

     */

    @SystemApi

    public static final String EXTRA_VOICEMAIL_NUMBER =

            "android.telephony.extra.VOICEMAIL_NUMBER";



    /**

     * The intent to call voicemail.

     * @hide

     */

    @SystemApi

    public static final String EXTRA_CALL_VOICEMAIL_INTENT =

            "android.telephony.extra.CALL_VOICEMAIL_INTENT";



    /**

     * The intent to launch voicemail settings.

     * @hide

     */

    @SystemApi

    public static final String EXTRA_LAUNCH_VOICEMAIL_SETTINGS_INTENT =

            "android.telephony.extra.LAUNCH_VOICEMAIL_SETTINGS_INTENT";



    /**

     * Response codes for sim activation. Activation completed successfully.

     * @hide