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

Commit c44e7f3f authored by Jordan Liu's avatar Jordan Liu Committed by android-build-merger
Browse files

Merge "Add editable_voicemail_number key to CarrierConfig" am: 25b64aad 

am: 2b7118fc

Change-Id: I4ca39a58ed1d35eae4a0b8802c027cd0c4c271ee
parents 1c4c9c76 2b7118fc

core/res/res/values/symbols.xml

+0 −2
Original line number Diff line number Diff line
@@ -345,8 +345,6 @@ 
  <java-symbol type="integer"  name="config_wifi_operating_voltage_mv" />

  <java-symbol type="string"  name="config_wifi_framework_sap_2G_channel_list" />



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



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

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

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

telephony/java/android/telephony/CarrierConfigManager.java

+9 −0
Original line number Diff line number Diff line
@@ -181,6 +181,14 @@ public class CarrierConfigManager { 
    /** After a CDMA conference call is merged, the swap button should be displayed. */

    public static final String KEY_SUPPORT_SWAP_AFTER_MERGE_BOOL = "support_swap_after_merge_bool";



    /**

     * Since the default voicemail number is empty, if a SIM card does not have a voicemail number

     * available the user cannot use voicemail. This flag allows the user to edit the voicemail

     * number in such cases, and is false by default.

     * @hide

     */

    public static final String KEY_EDITABLE_VOICEMAIL_NUMBER_BOOL= "editable_voicemail_number_bool";



    /**

     * Determine whether the voicemail notification is persistent in the notification bar. If true,

     * the voicemail notifications cannot be dismissed from the notification bar.
@@ -792,6 +800,7 @@ public class CarrierConfigManager { 
        sDefaults.putBoolean(KEY_SUPPORT_PAUSE_IMS_VIDEO_CALLS_BOOL, false);

        sDefaults.putBoolean(KEY_SUPPORT_SWAP_AFTER_MERGE_BOOL, true);

        sDefaults.putBoolean(KEY_USE_HFA_FOR_PROVISIONING_BOOL, false);

        sDefaults.putBoolean(KEY_EDITABLE_VOICEMAIL_NUMBER_BOOL, false);

        sDefaults.putBoolean(KEY_USE_OTASP_FOR_PROVISIONING_BOOL, false);

        sDefaults.putBoolean(KEY_VOICEMAIL_NOTIFICATION_PERSISTENT_BOOL, false);

        sDefaults.putBoolean(KEY_VOICE_PRIVACY_DISABLE_UI_BOOL, false);