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

Commit f6cfff56 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "5G icon default changed" into rvc-dev am: de9cd9f4 am: 07ab7e3b am:... 

Merge "5G icon default changed" into rvc-dev am: de9cd9f4 am: 07ab7e3b am: 8eccdd77 am: 26ad9d2c

Change-Id: Id4036a9b831e5b092b956a4ed5a70ab5ef6ffe8b
parents d4273d18 26ad9d2c

telephony/java/android/telephony/CarrierConfigManager.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -4065,7 +4065,8 @@ public class CarrierConfigManager { 
        sDefaults.putBoolean(KEY_USE_CALLER_ID_USSD_BOOL, false);

        sDefaults.putBoolean(KEY_USE_CALLER_ID_USSD_BOOL, false);

        sDefaults.putInt(KEY_CALL_WAITING_SERVICE_CLASS_INT, 1 /* SERVICE_CLASS_VOICE */);

        sDefaults.putInt(KEY_CALL_WAITING_SERVICE_CLASS_INT, 1 /* SERVICE_CLASS_VOICE */);

        sDefaults.putString(KEY_5G_ICON_CONFIGURATION_STRING,

        sDefaults.putString(KEY_5G_ICON_CONFIGURATION_STRING,

                "connected_mmwave:5G,connected:5G");

                "connected_mmwave:5G,connected:5G,not_restricted_rrc_idle:5G,"

                        + "not_restricted_rrc_con:5G");

        sDefaults.putInt(KEY_5G_ICON_DISPLAY_GRACE_PERIOD_SEC_INT, 0);

        sDefaults.putInt(KEY_5G_ICON_DISPLAY_GRACE_PERIOD_SEC_INT, 0);

        /* Default value is 1 hour. */

        /* Default value is 1 hour. */

        sDefaults.putLong(KEY_5G_WATCHDOG_TIME_MS_LONG, 3600000);

        sDefaults.putLong(KEY_5G_WATCHDOG_TIME_MS_LONG, 3600000);