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

Commit 2be612f8 authored by Jordan Liu's avatar Jordan Liu Committed by Android (Google) Code Review
Browse files

Merge "Add key to CarrierConfigManager"

parents 171f11b2 3ff30d22

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -36890,6 +36890,7 @@ package android.telephony { 
    field public static final java.lang.String KEY_CI_ACTION_ON_SYS_UPDATE_INTENT_STRING = "ci_action_on_sys_update_intent_string";

    field public static final java.lang.String KEY_CSP_ENABLED_BOOL = "csp_enabled_bool";

    field public static final java.lang.String KEY_DEFAULT_SIM_CALL_MANAGER_STRING = "default_sim_call_manager_string";

    field public static final java.lang.String KEY_DEFAULT_VM_NUMBER_STRING = "default_vm_number_string";

    field public static final java.lang.String KEY_DISABLE_CDMA_ACTIVATION_CODE_BOOL = "disable_cdma_activation_code_bool";

    field public static final java.lang.String KEY_DROP_VIDEO_CALL_WHEN_ANSWERING_AUDIO_CALL_BOOL = "drop_video_call_when_answering_audio_call_bool";

    field public static final java.lang.String KEY_DTMF_TYPE_ENABLED_BOOL = "dtmf_type_enabled_bool";

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -39972,6 +39972,7 @@ package android.telephony { 
    field public static final java.lang.String KEY_CI_ACTION_ON_SYS_UPDATE_INTENT_STRING = "ci_action_on_sys_update_intent_string";

    field public static final java.lang.String KEY_CSP_ENABLED_BOOL = "csp_enabled_bool";

    field public static final java.lang.String KEY_DEFAULT_SIM_CALL_MANAGER_STRING = "default_sim_call_manager_string";

    field public static final java.lang.String KEY_DEFAULT_VM_NUMBER_STRING = "default_vm_number_string";

    field public static final java.lang.String KEY_DISABLE_CDMA_ACTIVATION_CODE_BOOL = "disable_cdma_activation_code_bool";

    field public static final java.lang.String KEY_DROP_VIDEO_CALL_WHEN_ANSWERING_AUDIO_CALL_BOOL = "drop_video_call_when_answering_audio_call_bool";

    field public static final java.lang.String KEY_DTMF_TYPE_ENABLED_BOOL = "dtmf_type_enabled_bool";

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -36970,6 +36970,7 @@ package android.telephony { 
    field public static final java.lang.String KEY_CI_ACTION_ON_SYS_UPDATE_INTENT_STRING = "ci_action_on_sys_update_intent_string";

    field public static final java.lang.String KEY_CSP_ENABLED_BOOL = "csp_enabled_bool";

    field public static final java.lang.String KEY_DEFAULT_SIM_CALL_MANAGER_STRING = "default_sim_call_manager_string";

    field public static final java.lang.String KEY_DEFAULT_VM_NUMBER_STRING = "default_vm_number_string";

    field public static final java.lang.String KEY_DISABLE_CDMA_ACTIVATION_CODE_BOOL = "disable_cdma_activation_code_bool";

    field public static final java.lang.String KEY_DROP_VIDEO_CALL_WHEN_ANSWERING_AUDIO_CALL_BOOL = "drop_video_call_when_answering_audio_call_bool";

    field public static final java.lang.String KEY_DTMF_TYPE_ENABLED_BOOL = "dtmf_type_enabled_bool";

core/res/res/values/config.xml

+0 −15
Original line number Diff line number Diff line
@@ -2261,21 +2261,6 @@ 
        <item>SUPL_MODE=1</item>

    </string-array>



    <!-- If there is no preload VM number in the sim card, carriers such as

         Verizon require to load a default vm number from the configurantion.

         Define config_default_vm_number for this purpose. And there are two

         optional formats for this configuration as below:

         (1)<item>voicemail number</item>

         (2)<item>voicemail number;gid</item>

         The logic to pick up the correct voicemail number:

         (1) If the config_default_vm_number array has no gid special item, the last one will be

         picked

         (2) If the config_default_vm_number array has gid special item and  it matches the current

         sim's gid, it will be picked.

         (3) If the config_default_vm_number array has gid special item but it doesn't match the

         current sim's gid, the last one without gid will be picked -->

    <string-array translatable="false" name="config_default_vm_number" />



    <!-- Sprint need a 70 ms delay for 3way call -->

    <integer name="config_cdma_3waycall_flash_delay">0</integer>

core/res/res/values/symbols.xml

+0 −1
Original line number Diff line number Diff line
@@ -2265,7 +2265,6 @@ 
  <java-symbol type="bool" name="config_auto_attach_data_on_creation" />

  <java-symbol type="attr" name="closeItemLayout" />

  <java-symbol type="layout" name="resolver_different_item_header" />

  <java-symbol type="array" name="config_default_vm_number" />

  <java-symbol type="integer" name="config_cdma_3waycall_flash_delay"/>

  <java-symbol type="attr" name="windowBackgroundFallback" />

  <java-symbol type="id" name="textSpacerNoButtons" />