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

Commit af1d3205 authored by Jeff Davidson's avatar Jeff Davidson
Browse files

Make CarrierConfigManager#KEY_CDMA_ROAMING_MODE public. 

Mode constants have been moved to TelephonyManager.

Change-Id: I8c9091d9e71e1e38ff31e852301981f268b640cd
Fixes: 29163993
Test: TreeHugger only (no functional changes)
parent 32d9a5f3

api/current.txt

+5 −0
Original line number Diff line number Diff line
@@ -39867,6 +39867,7 @@ package android.telephony { 
    field public static final java.lang.String KEY_CDMA_3WAYCALL_FLASH_DELAY_INT = "cdma_3waycall_flash_delay_int";

    field public static final java.lang.String KEY_CDMA_DTMF_TONE_DELAY_INT = "cdma_dtmf_tone_delay_int";

    field public static final java.lang.String KEY_CDMA_NONROAMING_NETWORKS_STRING_ARRAY = "cdma_nonroaming_networks_string_array";

    field public static final java.lang.String KEY_CDMA_ROAMING_MODE_INT = "cdma_roaming_mode_int";

    field public static final java.lang.String KEY_CDMA_ROAMING_NETWORKS_STRING_ARRAY = "cdma_roaming_networks_string_array";

    field public static final java.lang.String KEY_CI_ACTION_ON_SYS_UPDATE_BOOL = "ci_action_on_sys_update_bool";

    field public static final java.lang.String KEY_CI_ACTION_ON_SYS_UPDATE_EXTRA_STRING = "ci_action_on_sys_update_extra_string";
@@ -40603,6 +40604,10 @@ package android.telephony { 
    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

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

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

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

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

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

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

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

api/system-current.txt

+5 −0
Original line number Diff line number Diff line
@@ -43382,6 +43382,7 @@ package android.telephony { 
    field public static final java.lang.String KEY_CDMA_3WAYCALL_FLASH_DELAY_INT = "cdma_3waycall_flash_delay_int";

    field public static final java.lang.String KEY_CDMA_DTMF_TONE_DELAY_INT = "cdma_dtmf_tone_delay_int";

    field public static final java.lang.String KEY_CDMA_NONROAMING_NETWORKS_STRING_ARRAY = "cdma_nonroaming_networks_string_array";

    field public static final java.lang.String KEY_CDMA_ROAMING_MODE_INT = "cdma_roaming_mode_int";

    field public static final java.lang.String KEY_CDMA_ROAMING_NETWORKS_STRING_ARRAY = "cdma_roaming_networks_string_array";

    field public static final java.lang.String KEY_CI_ACTION_ON_SYS_UPDATE_BOOL = "ci_action_on_sys_update_bool";

    field public static final java.lang.String KEY_CI_ACTION_ON_SYS_UPDATE_EXTRA_STRING = "ci_action_on_sys_update_extra_string";
@@ -44225,6 +44226,10 @@ package android.telephony { 
    field public static final int CARRIER_PRIVILEGE_STATUS_HAS_ACCESS = 1; // 0x1

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

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

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

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

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

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

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

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

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

api/test-current.txt

+5 −0
Original line number Diff line number Diff line
@@ -40263,6 +40263,7 @@ package android.telephony { 
    field public static final java.lang.String KEY_CDMA_3WAYCALL_FLASH_DELAY_INT = "cdma_3waycall_flash_delay_int";

    field public static final java.lang.String KEY_CDMA_DTMF_TONE_DELAY_INT = "cdma_dtmf_tone_delay_int";

    field public static final java.lang.String KEY_CDMA_NONROAMING_NETWORKS_STRING_ARRAY = "cdma_nonroaming_networks_string_array";

    field public static final java.lang.String KEY_CDMA_ROAMING_MODE_INT = "cdma_roaming_mode_int";

    field public static final java.lang.String KEY_CDMA_ROAMING_NETWORKS_STRING_ARRAY = "cdma_roaming_networks_string_array";

    field public static final java.lang.String KEY_CI_ACTION_ON_SYS_UPDATE_BOOL = "ci_action_on_sys_update_bool";

    field public static final java.lang.String KEY_CI_ACTION_ON_SYS_UPDATE_EXTRA_STRING = "ci_action_on_sys_update_extra_string";
@@ -40999,6 +41000,10 @@ package android.telephony { 
    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

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

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

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

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

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

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

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

telephony/java/android/telephony/CarrierConfigManager.java

+14 −16
Original line number Diff line number Diff line
@@ -1181,24 +1181,21 @@ public class CarrierConfigManager { 
     */

    public static final String KEY_CDMA_3WAYCALL_FLASH_DELAY_INT = "cdma_3waycall_flash_delay_int";





    /**

     * @hide

     * The default value for preferred CDMA roaming mode (aka CDMA system select.)

     *          CDMA_ROAMING_MODE_RADIO_DEFAULT = the default roaming mode from the radio

     *          CDMA_ROAMING_MODE_HOME = Home Networks

     *          CDMA_ROAMING_MODE_AFFILIATED = Roaming on Affiliated networks

     *          CDMA_ROAMING_MODE_ANY = Roaming on any networks

     * The CDMA roaming mode (aka CDMA system select).

     *

     * <p>The value should be one of the CDMA_ROAMING_MODE_ constants in {@link TelephonyManager}.

     * Values other than {@link TelephonyManager#CDMA_ROAMING_MODE_RADIO_DEFAULT} (which is the

     * default) will take precedence over user selection.

     *

     * @see TelephonyManager#CDMA_ROAMING_MODE_RADIO_DEFAULT

     * @see TelephonyManager#CDMA_ROAMING_MODE_HOME

     * @see TelephonyManager#CDMA_ROAMING_MODE_AFFILIATED

     * @see TelephonyManager#CDMA_ROAMING_MODE_ANY

     */

    public static final String KEY_CDMA_ROAMING_MODE_INT = "cdma_roaming_mode_int";

    /** @hide */

    public static final int CDMA_ROAMING_MODE_RADIO_DEFAULT = -1;

    /** @hide */

    public static final int CDMA_ROAMING_MODE_HOME = 0;

    /** @hide */

    public static final int CDMA_ROAMING_MODE_AFFILIATED = 1;

    /** @hide */

    public static final int CDMA_ROAMING_MODE_ANY = 2;





    /**

     * Boolean indicating if support is provided for directly dialing FDN number from FDN list.

     * If false, this feature is not supported.
@@ -1807,7 +1804,8 @@ public class CarrierConfigManager { 
        sDefaults.putBoolean(KEY_ALLOW_NON_EMERGENCY_CALLS_IN_ECM_BOOL, true);

        sDefaults.putBoolean(KEY_USE_RCS_PRESENCE_BOOL, false);

        sDefaults.putBoolean(KEY_FORCE_IMEI_BOOL, false);

        sDefaults.putInt(KEY_CDMA_ROAMING_MODE_INT, CDMA_ROAMING_MODE_RADIO_DEFAULT);

        sDefaults.putInt(

                KEY_CDMA_ROAMING_MODE_INT, TelephonyManager.CDMA_ROAMING_MODE_RADIO_DEFAULT);

        sDefaults.putString(KEY_RCS_CONFIG_SERVER_URL_STRING, "");



        // Carrier Signalling Receivers

telephony/java/android/telephony/TelephonyManager.java

+21 −0
Original line number Diff line number Diff line
@@ -953,6 +953,27 @@ public class TelephonyManager { 
     */

    public static final int USSD_ERROR_SERVICE_UNAVAIL = -2;



    /**

     * Value for {@link CarrierConfigManager#KEY_CDMA_ROAMING_MODE_INT} which leaves the roaming

     * mode set to the radio default or to the user's preference if they've indicated one.

     */

    public static final int CDMA_ROAMING_MODE_RADIO_DEFAULT = -1;

    /**

     * Value for {@link CarrierConfigManager#KEY_CDMA_ROAMING_MODE_INT} which only permits

     * connections on home networks.

     */

    public static final int CDMA_ROAMING_MODE_HOME = 0;

    /**

     * Value for {@link CarrierConfigManager#KEY_CDMA_ROAMING_MODE_INT} which permits roaming on

     * affiliated networks.

     */

    public static final int CDMA_ROAMING_MODE_AFFILIATED = 1;

    /**

     * Value for {@link CarrierConfigManager#KEY_CDMA_ROAMING_MODE_INT} which permits roaming on

     * any network.

     */

    public static final int CDMA_ROAMING_MODE_ANY = 2;



    //

    //

    // Device Info