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

Commit 7273f041 authored by Gil Cukierman's avatar Gil Cukierman Committed by Android (Google) Code Review
Browse files

Merge "Soft Remove CarrierConfigManager.KEY_HIDE_ENABLE_2G" into main

parents c7873f85 5d266417

core/api/current.txt

+0 −1
Original line number Diff line number Diff line
@@ -42982,7 +42982,6 @@ package android.telephony { 
    field public static final String KEY_GSM_ROAMING_NETWORKS_STRING_ARRAY = "gsm_roaming_networks_string_array";

    field public static final String KEY_HAS_IN_CALL_NOISE_SUPPRESSION_BOOL = "has_in_call_noise_suppression_bool";

    field public static final String KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL = "hide_carrier_network_settings_bool";

    field @Deprecated public static final String KEY_HIDE_ENABLE_2G = "hide_enable_2g_bool";

    field public static final String KEY_HIDE_ENHANCED_4G_LTE_BOOL = "hide_enhanced_4g_lte_bool";

    field public static final String KEY_HIDE_IMS_APN_BOOL = "hide_ims_apn_bool";

    field public static final String KEY_HIDE_LTE_PLUS_DATA_ICON_BOOL = "hide_lte_plus_data_icon_bool";

core/api/removed.txt

+4 −0
Original line number Diff line number Diff line
@@ -472,6 +472,10 @@ package android.speech.tts { 


package android.telephony {



  public class CarrierConfigManager {

    field @Deprecated public static final String KEY_HIDE_ENABLE_2G = "hide_enable_2g_bool";

  }



  public class NetworkScan {

    method @Deprecated public void stop() throws android.os.RemoteException;

  }

telephony/java/android/telephony/CarrierConfigManager.java

+3 −5
Original line number Diff line number Diff line
@@ -519,8 +519,6 @@ public class CarrierConfigManager { 
    /**

     * Used in the Preferred Network Types menu to determine if the 2G option is displayed.

     * Value defaults to false as of Android T to discourage the use of insecure 2G protocols.

     *

     * @see #KEY_HIDE_ENABLE_2G

     */

    public static final String KEY_PREFER_2G_BOOL = "prefer_2g_bool";
@@ -9541,9 +9539,9 @@ public class CarrierConfigManager { 
     * Used to trade privacy/security against potentially reduced carrier coverage for some

     * carriers.

     *

     * @deprecated Future versions of Android will disallow carriers from hiding this toggle

     * because disabling 2g is a security feature that users should always have access to at

     * their discretion.

     * @removed This config option is no longer supported as it was hiding a security feature

     * from users. Setting this option will not change the behavior of the Settings menu starting

     * in Android V.

     */

    @Deprecated

    public static final String KEY_HIDE_ENABLE_2G = "hide_enable_2g_bool";