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

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

Merge "Rename EXTRA_NUM_OF_ACTIVE_SIM_SUPPORTED." into rvc-dev

parents a903ed0d 4b3693e9

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -48286,6 +48286,7 @@ package android.telephony { 
    field public static final int DATA_DISCONNECTING = 4; // 0x4

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

    field public static final int DATA_UNKNOWN = -1; // 0xffffffff

    field public static final String EXTRA_ACTIVE_SIM_SUPPORTED_COUNT = "android.telephony.extra.ACTIVE_SIM_SUPPORTED_COUNT";

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

    field public static final String EXTRA_CARRIER_ID = "android.telephony.extra.CARRIER_ID";

    field public static final String EXTRA_CARRIER_NAME = "android.telephony.extra.CARRIER_NAME";
@@ -48295,7 +48296,6 @@ package android.telephony { 
    field public static final String EXTRA_LAUNCH_VOICEMAIL_SETTINGS_INTENT = "android.telephony.extra.LAUNCH_VOICEMAIL_SETTINGS_INTENT";

    field public static final String EXTRA_NETWORK_COUNTRY = "android.telephony.extra.NETWORK_COUNTRY";

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

    field public static final String EXTRA_NUM_OF_ACTIVE_SIM_SUPPORTED = "android.telephony.extra.NUM_OF_ACTIVE_SIM_SUPPORTED";

    field public static final String EXTRA_PHONE_ACCOUNT_HANDLE = "android.telephony.extra.PHONE_ACCOUNT_HANDLE";

    field public static final String EXTRA_SPECIFIC_CARRIER_ID = "android.telephony.extra.SPECIFIC_CARRIER_ID";

    field public static final String EXTRA_SPECIFIC_CARRIER_NAME = "android.telephony.extra.SPECIFIC_CARRIER_NAME";

telephony/java/android/telephony/TelephonyManager.java

+5 −3
Original line number Diff line number Diff line
@@ -1057,7 +1057,7 @@ public class TelephonyManager { 
     * or that all steps during multi-SIM change are done. To know those information you still need

     * to listen to SIM_STATE changes or active subscription changes.

     *

     * See extra of {@link #EXTRA_NUM_OF_ACTIVE_SIM_SUPPORTED} for updated value.

     * See extra of {@link #EXTRA_ACTIVE_SIM_SUPPORTED_COUNT} for updated value.

     */

    public static final String ACTION_MULTI_SIM_CONFIG_CHANGED =

            "android.telephony.action.MULTI_SIM_CONFIG_CHANGED";
@@ -1067,6 +1067,8 @@ public class TelephonyManager { 
     * The number of active SIM supported by current multi-SIM config. It's not related to how many

     * SIM/subscriptions are currently active.

     *

     * Same value will be returned by {@link #getActiveModemCount()}.

     *

     * For single SIM mode, it's 1.

     * For DSDS or DSDA mode, it's 2.

     * For triple-SIM mode, it's 3.
@@ -1075,8 +1077,8 @@ public class TelephonyManager { 
     *

     * type: integer

     */

    public static final String EXTRA_NUM_OF_ACTIVE_SIM_SUPPORTED =

            "android.telephony.extra.NUM_OF_ACTIVE_SIM_SUPPORTED";

    public static final String EXTRA_ACTIVE_SIM_SUPPORTED_COUNT =

            "android.telephony.extra.ACTIVE_SIM_SUPPORTED_COUNT";



    /**

     * @hide