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

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

Merge "Make voicemail notification broadcast public" am: 6a563261 am: 9b614bae am: f05c651c 

am: dcb9f3c8

Change-Id: I0d5e582d5e145c59ee1f24258c74549ec0acf7aa
parents 9b2cdd9b dcb9f3c8

api/current.txt

+5 −0
Original line number Diff line number Diff line
@@ -37683,6 +37683,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 APPTYPE_CSIM = 4; // 0x4

    field public static final int APPTYPE_ISIM = 5; // 0x5

    field public static final int APPTYPE_RUIM = 3; // 0x3
@@ -37702,11 +37703,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

api/test-current.txt

+5 −0
Original line number Diff line number Diff line
@@ -37773,6 +37773,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 APPTYPE_CSIM = 4; // 0x4

    field public static final int APPTYPE_ISIM = 5; // 0x5

    field public static final int APPTYPE_RUIM = 3; // 0x3
@@ -37792,11 +37793,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

+18 −11
Original line number Diff line number Diff line
@@ -686,42 +686,49 @@ 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

     * Broadcast intent action for letting the default dialer to know to show voicemail

     * notification.

     *

     * <p>

     * The {@link #EXTRA_NOTIFICATION_COUNT} extra indicates the total numbers of unheard

     * voicemails.

     * The {@link #EXTRA_VOICEMAIL_NUMBER} extra indicates the voicemail number if available.

     * The {@link #EXTRA_CALL_VOICEMAIL_INTENT} extra is a {@link android.app.PendingIntent} that

     * will call the voicemail number when sent. This extra will be empty if the voicemail number

     * is not set, and {@link #EXTRA_LAUNCH_VOICEMAIL_SETTINGS_INTENT} will be set instead.

     * The {@link #EXTRA_LAUNCH_VOICEMAIL_SETTINGS_INTENT} extra is a

     * {@link android.app.PendingIntent} that will launch the voicemail settings. This extra is only

     * available when the voicemail number is not set.

     *

     * @see #EXTRA_NOTIFICATION_COUNT

     * @see #EXTRA_VOICEMAIL_NUMBER

     * @see #EXTRA_CALL_VOICEMAIL_INTENT

     * @see #EXTRA_LAUNCH_VOICEMAIL_SETTINGS_INTENT

     */

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