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

Commit 9c1279d2 authored by Cassie Han's avatar Cassie Han Committed by Gerrit Code Review
Browse files

Merge "Migrate flag config_telephony_use_own_number_for_voicemail to Carrier Config."

parents 9ea410a6 661f6313

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -39881,6 +39881,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
@@ -1753,9 +1753,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
@@ -272,7 +272,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" />

telephony/java/android/telephony/CarrierConfigManager.java

+12 −0
Original line number Diff line number Diff line
@@ -351,6 +351,17 @@ public class CarrierConfigManager { 
     */

    public static final String KEY_DEFAULT_VM_NUMBER_STRING = "default_vm_number_string";



    /**

     * Flag that specifies to use the user's own phone number as the voicemail number when there is

     * no pre-loaded voicemail number on the SIM card.

     * <p>

     * {@link #KEY_DEFAULT_VM_NUMBER_STRING} takes precedence over this flag.

     * <p>

     * If false, the system default (*86) will be used instead.

     */

    public static final String KEY_CONFIG_TELEPHONY_USE_OWN_NUMBER_FOR_VOICEMAIL_BOOL =

            "config_telephony_use_own_number_for_voicemail_bool";



    /**

     * When {@code true}, changes to the mobile data enabled switch will not cause the VT

     * registration state to change.  That is, turning on or off mobile data will not cause VT to be
@@ -1737,6 +1748,7 @@ public class CarrierConfigManager { 
        sDefaults.putBoolean(KEY_NOTIFY_HANDOVER_VIDEO_FROM_WIFI_TO_LTE_BOOL, false);

        sDefaults.putBoolean(KEY_SUPPORT_DOWNGRADE_VT_TO_AUDIO_BOOL, true);

        sDefaults.putString(KEY_DEFAULT_VM_NUMBER_STRING, "");

        sDefaults.putBoolean(KEY_CONFIG_TELEPHONY_USE_OWN_NUMBER_FOR_VOICEMAIL_BOOL, false);

        sDefaults.putBoolean(KEY_IGNORE_DATA_ENABLED_CHANGED_FOR_VIDEO_CALLS, true);

        sDefaults.putBoolean(KEY_VILTE_DATA_IS_METERED_BOOL, true);

        sDefaults.putBoolean(KEY_CARRIER_WFC_IMS_AVAILABLE_BOOL, false);