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

Commit 0d7c07c7 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Make Telephony to Setting notification @SystemApi am: 7c5e8239 am: 6078c864 

Change-Id: Ic9b5187561b51565877977450a157364689a6069
parents f68b28e3 6078c864

api/system-current.txt

+10 −0
Original line number Diff line number Diff line
@@ -9780,6 +9780,12 @@ package android.telephony { 
    field public static final String EXTRA_APN_TYPE_INT = "apnTypeInt";

    field public static final String EXTRA_DATA_SPN = "android.telephony.extra.DATA_SPN";

    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";
@@ -9787,6 +9793,10 @@ package android.telephony { 
    field public static final String EXTRA_REDIRECTION_URL = "redirectionUrl";

    field public static final String EXTRA_SHOW_PLMN = "android.telephony.extra.SHOW_PLMN";

    field public static final String EXTRA_SHOW_SPN = "android.telephony.extra.SHOW_SPN";

    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_SPN = "android.telephony.extra.SPN";

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

telephony/java/android/telephony/TelephonyManager.java

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

     * @hide

     */

    @SystemApi

    public static final String EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE =

            "android.telephony.extra.DEFAULT_SUBSCRIPTION_SELECT_TYPE";
@@ -1437,6 +1438,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;



    /**
@@ -1444,6 +1446,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;



    /**
@@ -1451,6 +1454,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;



    /**
@@ -1458,6 +1462,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;



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

     * @hide

     */

    @SystemApi

    public static final int EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE_ALL = 4;



    /**
@@ -1476,6 +1482,7 @@ public class TelephonyManager { 
     *

     * @hide

     */

    @SystemApi

    public static final String EXTRA_SIM_COMBINATION_WARNING_TYPE =

            "android.telephony.extra.SIM_COMBINATION_WARNING_TYPE";
@@ -1492,6 +1499,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;



    /**
@@ -1499,6 +1507,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;



    /**
@@ -1509,6 +1518,7 @@ public class TelephonyManager { 
     *

     * @hide

     */

    @SystemApi

    public static final String EXTRA_SIM_COMBINATION_NAMES =

            "android.telephony.extra.SIM_COMBINATION_NAMES";