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

Commit 1f5aed3a authored by Gil Cukierman's avatar Gil Cukierman Committed by Automerger Merge Worker
Browse files

Merge "Deprecate CarrierConfigManager.KEY_HIDE_ENABLE_2G" am: 09762c6a am:... 

Merge "Deprecate CarrierConfigManager.KEY_HIDE_ENABLE_2G" am: 09762c6a am: 4d0ee1d0 am: d5c8beeb

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2268206



Change-Id: I65043f0aef7be261b10b0d6f7035b40de3d1aff8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 75a1aca5 d5c8beeb

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -41722,7 +41722,7 @@ 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 public static final String KEY_HIDE_ENABLE_2G = "hide_enable_2g_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";

telephony/java/android/telephony/CarrierConfigManager.java

+5 −0
Original line number Diff line number Diff line
@@ -8615,7 +8615,12 @@ 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.

     */

    @Deprecated

    public static final String KEY_HIDE_ENABLE_2G = "hide_enable_2g_bool";



    /**