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

Commit 4695b55b authored by SongFerng Wang's avatar SongFerng Wang Committed by Android (Google) Code Review
Browse files

Merge "Add the carrier config to control the preferred network 3G item" into main

parents 01f5ca18 0c488a36

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -43403,6 +43403,7 @@ package android.telephony { 
    field @FlaggedApi("com.android.internal.telephony.flags.carrier_enabled_satellite_flag") public static final String KEY_PARAMETERS_USED_FOR_NTN_LTE_SIGNAL_BAR_INT = "parameters_used_for_ntn_lte_signal_bar_int";

    field public static final String KEY_PING_TEST_BEFORE_DATA_SWITCH_BOOL = "ping_test_before_data_switch_bool";

    field public static final String KEY_PREFER_2G_BOOL = "prefer_2g_bool";

    field @FlaggedApi("com.android.internal.telephony.flags.hide_prefer_3g_item") public static final String KEY_PREFER_3G_VISIBILITY_BOOL = "prefer_3g_visibility_bool";

    field public static final String KEY_PREMIUM_CAPABILITY_MAXIMUM_DAILY_NOTIFICATION_COUNT_INT = "premium_capability_maximum_daily_notification_count_int";

    field public static final String KEY_PREMIUM_CAPABILITY_MAXIMUM_MONTHLY_NOTIFICATION_COUNT_INT = "premium_capability_maximum_monthly_notification_count_int";

    field public static final String KEY_PREMIUM_CAPABILITY_NETWORK_SETUP_TIME_MILLIS_LONG = "premium_capability_network_setup_time_millis_long";

telephony/java/android/telephony/CarrierConfigManager.java

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

    public static final String KEY_PREFER_2G_BOOL = "prefer_2g_bool";













    /**













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













     */













    @FlaggedApi(Flags.FLAG_HIDE_PREFER_3G_ITEM)













    public static final String KEY_PREFER_3G_VISIBILITY_BOOL = "prefer_3g_visibility_bool";



























    /**















     * Used in Cellular Network Settings for preferred network type to show 4G only mode.















     * @hide










@@ -10144,6 +10150,7 @@ public class CarrierConfigManager {













        sDefaults.putBoolean(KEY_MDN_IS_ADDITIONAL_VOICEMAIL_NUMBER_BOOL, false);















        sDefaults.putBoolean(KEY_OPERATOR_SELECTION_EXPAND_BOOL, true);















        sDefaults.putBoolean(KEY_PREFER_2G_BOOL, false);













        sDefaults.putBoolean(KEY_PREFER_3G_VISIBILITY_BOOL, true);















        sDefaults.putBoolean(KEY_4G_ONLY_BOOL, false);















        sDefaults.putBoolean(KEY_SHOW_APN_SETTING_CDMA_BOOL, false);















        sDefaults.putBoolean(KEY_SHOW_CDMA_CHOICES_BOOL, false);