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

Commit 57b7ec04 authored by Jonathan Basseri's avatar Jonathan Basseri Committed by Android (Google) Code Review
Browse files

Merge "Rename KEY_VOICE_PRIVACY_DISABLE_BOOL -> KEY_VOICE_PRIVACY_DISABLE_UI_BOOL" into mnc-dev

parents 9d543ebf 3360c265

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -30736,7 +30736,7 @@ package android.telephony { 
    field public static final java.lang.String KEY_USE_HFA_FOR_PROVISIONING_BOOL = "use_hfa_for_provisioning_bool";

    field public static final java.lang.String KEY_USE_OTASP_FOR_PROVISIONING_BOOL = "use_otasp_for_provisioning_bool";

    field public static final java.lang.String KEY_VOICEMAIL_NOTIFICATION_PERSISTENT_BOOL = "voicemail_notification_persistent_bool";

    field public static final java.lang.String KEY_VOICE_PRIVACY_DISABLE_BOOL = "voice_privacy_disable_bool";

    field public static final java.lang.String KEY_VOICE_PRIVACY_DISABLE_UI_BOOL = "voice_privacy_disable_ui_bool";

    field public static final java.lang.String KEY_VOLTE_REPLACEMENT_RAT_INT = "volte_replacement_rat_int";

    field public static final java.lang.String KEY_WORLD_PHONE_BOOL = "world_phone_bool";

  }

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -32954,7 +32954,7 @@ package android.telephony { 
    field public static final java.lang.String KEY_USE_HFA_FOR_PROVISIONING_BOOL = "use_hfa_for_provisioning_bool";

    field public static final java.lang.String KEY_USE_OTASP_FOR_PROVISIONING_BOOL = "use_otasp_for_provisioning_bool";

    field public static final java.lang.String KEY_VOICEMAIL_NOTIFICATION_PERSISTENT_BOOL = "voicemail_notification_persistent_bool";

    field public static final java.lang.String KEY_VOICE_PRIVACY_DISABLE_BOOL = "voice_privacy_disable_bool";

    field public static final java.lang.String KEY_VOICE_PRIVACY_DISABLE_UI_BOOL = "voice_privacy_disable_ui_bool";

    field public static final java.lang.String KEY_VOLTE_REPLACEMENT_RAT_INT = "volte_replacement_rat_int";

    field public static final java.lang.String KEY_WORLD_PHONE_BOOL = "world_phone_bool";

  }

telephony/java/android/telephony/CarrierConfigManager.java

+2 −2
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ public class CarrierConfigManager { 
            KEY_ALLOW_EMERGENCY_NUMBERS_IN_CALL_LOG_BOOL = "allow_emergency_numbers_in_call_log_bool";



    /** If true, removes the Voice Privacy option from Call Settings */

    public static final String KEY_VOICE_PRIVACY_DISABLE_BOOL = "voice_privacy_disable_bool";

    public static final String KEY_VOICE_PRIVACY_DISABLE_UI_BOOL = "voice_privacy_disable_ui_bool";



    /** Control whether users can reach the carrier portions of Cellular Network Settings. */

    public static final String
@@ -302,7 +302,7 @@ public class CarrierConfigManager { 
        sDefaults.putBoolean(KEY_USE_HFA_FOR_PROVISIONING_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_BOOL, false);

        sDefaults.putBoolean(KEY_VOICE_PRIVACY_DISABLE_UI_BOOL, false);

        sDefaults.putBoolean(KEY_WORLD_PHONE_BOOL, false);

        sDefaults.putInt(KEY_VOLTE_REPLACEMENT_RAT_INT, 0);

        sDefaults.putString(KEY_VVM_DESTINATION_NUMBER_STRING, "");