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

Commit e020c007 authored by Xi Han's avatar Xi Han Committed by Android (Google) Code Review
Browse files

Merge "Migrate flag config_telephony_use_own_number_for_voicemail to Carrier Config."

parents 941dcba6 4c6f72cc

api/current.txt

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

    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_CONFIG_IMS_PACKAGE_OVERRIDE_STRING = "config_ims_package_override_string";

    field public static final java.lang.String KEY_CONFIG_TELEPHONY_USE_OWN_NUMBER_FOR_VOICEMAIL_BOOL = "config_telephony_use_own_number_for_voicemail_bool";

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

    field public static final java.lang.String KEY_DATA_LIMIT_THRESHOLD_BYTES_LONG = "data_limit_threshold_bytes_long";

    field public static final java.lang.String KEY_DATA_WARNING_THRESHOLD_BYTES_LONG = "data_warning_threshold_bytes_long";

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -43429,6 +43429,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_CONFIG_IMS_PACKAGE_OVERRIDE_STRING = "config_ims_package_override_string";

    field public static final java.lang.String KEY_CONFIG_PLANS_PACKAGE_OVERRIDE_STRING = "config_plans_package_override_string";

    field public static final java.lang.String KEY_CONFIG_TELEPHONY_USE_OWN_NUMBER_FOR_VOICEMAIL_BOOL = "config_telephony_use_own_number_for_voicemail_bool";

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

    field public static final java.lang.String KEY_DATA_LIMIT_THRESHOLD_BYTES_LONG = "data_limit_threshold_bytes_long";

    field public static final java.lang.String KEY_DATA_WARNING_THRESHOLD_BYTES_LONG = "data_warning_threshold_bytes_long";

api/test-current.txt

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

    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_CONFIG_IMS_PACKAGE_OVERRIDE_STRING = "config_ims_package_override_string";

    field public static final java.lang.String KEY_CONFIG_TELEPHONY_USE_OWN_NUMBER_FOR_VOICEMAIL_BOOL = "config_telephony_use_own_number_for_voicemail_bool";

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

    field public static final java.lang.String KEY_DATA_LIMIT_THRESHOLD_BYTES_LONG = "data_limit_threshold_bytes_long";

    field public static final java.lang.String KEY_DATA_WARNING_THRESHOLD_BYTES_LONG = "data_warning_threshold_bytes_long";

core/res/res/values/config.xml

+0 −3
Original line number Diff line number Diff line
@@ -1765,9 +1765,6 @@ 
    <string-array name="config_twoDigitNumberPattern" translatable="false">

    </string-array>



    <!-- The VoiceMail default value is displayed to my own number if it is true -->

    <bool name="config_telephony_use_own_number_for_voicemail">false</bool>



    <!-- If this value is true, Sms encoded as octet is decoded by utf8 decoder.

         If false, decoded by Latin decoder. -->

    <bool name="config_sms_utf8_support">false</bool>

core/res/res/values/symbols.xml

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

  <java-symbol type="bool" name="config_swipeDisambiguation" />

  <java-symbol type="bool" name="config_syncstorageengine_masterSyncAutomatically" />

  <java-symbol type="bool" name="config_telephony_use_own_number_for_voicemail" />

  <java-symbol type="bool" name="config_ui_enableFadingMarquee" />

  <java-symbol type="bool" name="config_enableHapticTextHandle" />

  <java-symbol type="bool" name="config_use_strict_phone_number_comparation" />