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

Commit eee8650a authored by Xiangyu/Malcolm Chen's avatar Xiangyu/Malcolm Chen Committed by Android (Google) Code Review
Browse files

Merge "Make Telephony to Setting notification @SystemApi"

parents 3dd4c345 af2d3036

api/system-current.txt

+10 −0
Original line number Diff line number Diff line
@@ -11342,12 +11342,22 @@ package android.telephony { 
    field @Deprecated public static final String EXTRA_APN_TYPE = "apnType";

    field public static final String EXTRA_APN_TYPE_INT = "apnTypeInt";

    field public static final String EXTRA_DEFAULT_NETWORK_AVAILABLE = "defaultNetworkAvailable";

    field public static final String EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE = "android.telephony.extra.DEFAULT_SUBSCRIPTION_SELECT_TYPE";

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

    field public static final int EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE_DATA = 1; // 0x1

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

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

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

    field public static final String EXTRA_ERROR_CODE = "errorCode";

    field public static final String EXTRA_PCO_ID = "pcoId";

    field public static final String EXTRA_PCO_VALUE = "pcoValue";

    field public static final String EXTRA_PHONE_IN_ECM_STATE = "android.telephony.extra.PHONE_IN_ECM_STATE";

    field public static final String EXTRA_PHONE_IN_EMERGENCY_CALL = "android.telephony.extra.PHONE_IN_EMERGENCY_CALL";

    field public static final String EXTRA_REDIRECTION_URL = "redirectionUrl";

    field public static final String EXTRA_SIM_COMBINATION_NAMES = "android.telephony.extra.SIM_COMBINATION_NAMES";

    field public static final String EXTRA_SIM_COMBINATION_WARNING_TYPE = "android.telephony.extra.SIM_COMBINATION_WARNING_TYPE";

    field public static final int EXTRA_SIM_COMBINATION_WARNING_TYPE_DUAL_CDMA = 1; // 0x1

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

    field public static final String EXTRA_SIM_STATE = "android.telephony.extra.SIM_STATE";

    field public static final String EXTRA_VISUAL_VOICEMAIL_ENABLED_BY_USER_BOOL = "android.telephony.extra.VISUAL_VOICEMAIL_ENABLED_BY_USER_BOOL";

    field public static final String EXTRA_VOICEMAIL_SCRAMBLED_PIN_STRING = "android.telephony.extra.VOICEMAIL_SCRAMBLED_PIN_STRING";

telephony/java/android/telephony/TelephonyManager.java

+10 −0
Original line number Diff line number Diff line
@@ -1364,6 +1364,7 @@ public class TelephonyManager { 
     *

     * @hide

     */

    @SystemApi

    public static final String EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE =

            "android.telephony.extra.DEFAULT_SUBSCRIPTION_SELECT_TYPE";
@@ -1383,6 +1384,7 @@ public class TelephonyManager { 
     * to indicate there's no need to re-select any default subscription.

     * @hide

     */

    @SystemApi

    public static final int EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE_NONE = 0;



    /**
@@ -1390,6 +1392,7 @@ public class TelephonyManager { 
     * to indicate there's a need to select default data subscription.

     * @hide

     */

    @SystemApi

    public static final int EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE_DATA = 1;



    /**
@@ -1397,6 +1400,7 @@ public class TelephonyManager { 
     * to indicate there's a need to select default voice call subscription.

     * @hide

     */

    @SystemApi

    public static final int EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE_VOICE = 2;



    /**
@@ -1404,6 +1408,7 @@ public class TelephonyManager { 
     * to indicate there's a need to select default sms subscription.

     * @hide

     */

    @SystemApi

    public static final int EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE_SMS = 3;



    /**
@@ -1413,6 +1418,7 @@ public class TelephonyManager { 
     * which subscription should be the default subscription.

     * @hide

     */

    @SystemApi

    public static final int EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE_ALL = 4;



    /**
@@ -1422,6 +1428,7 @@ public class TelephonyManager { 
     *

     * @hide

     */

    @SystemApi

    public static final String EXTRA_SIM_COMBINATION_WARNING_TYPE =

            "android.telephony.extra.SIM_COMBINATION_WARNING_TYPE";
@@ -1438,6 +1445,7 @@ public class TelephonyManager { 
     * to indicate there's no SIM combination warning.

     * @hide

     */

    @SystemApi

    public static final int EXTRA_SIM_COMBINATION_WARNING_TYPE_NONE = 0;



    /**
@@ -1445,6 +1453,7 @@ public class TelephonyManager { 
     * to indicate two active SIMs are both CDMA hence there might be functional limitation.

     * @hide

     */

    @SystemApi

    public static final int EXTRA_SIM_COMBINATION_WARNING_TYPE_DUAL_CDMA = 1;



    /**
@@ -1455,6 +1464,7 @@ public class TelephonyManager { 
     *

     * @hide

     */

    @SystemApi

    public static final String EXTRA_SIM_COMBINATION_NAMES =

            "android.telephony.extra.SIM_COMBINATION_NAMES";