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

Commit a26e957b authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix default value type : should be long instead of int .." am:... 

Merge "Fix default value type : should be long instead of int .." am: 061654bd am: ea1c39ce am: 6c7a8504 am: 47ee8d38

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

Change-Id: I4573004b3c6e56c0157a7c937e00174cb4fcb84a
parents db5e27a5 47ee8d38

telephony/java/android/telephony/CarrierConfigManager.java

+3 −3
Original line number Diff line number Diff line
@@ -8646,10 +8646,10 @@ public class CarrierConfigManager { 
        /* Default value is 2 seconds. */

        sDefaults.putLong(KEY_OPPORTUNISTIC_NETWORK_5G_DATA_SWITCH_EXIT_HYSTERESIS_TIME_LONG, 2000);

        sDefaults.putBoolean(KEY_ENABLE_4G_OPPORTUNISTIC_NETWORK_SCAN_BOOL, true);

        sDefaults.putInt(KEY_TIME_TO_SWITCH_BACK_TO_PRIMARY_IF_OPPORTUNISTIC_OOS_LONG, 60000);

        sDefaults.putInt(

        sDefaults.putLong(KEY_TIME_TO_SWITCH_BACK_TO_PRIMARY_IF_OPPORTUNISTIC_OOS_LONG, 60000L);

        sDefaults.putLong(

                KEY_OPPORTUNISTIC_TIME_TO_SCAN_AFTER_CAPABILITY_SWITCH_TO_PRIMARY_LONG,

                120000);

                120000L);

        sDefaults.putAll(ImsServiceEntitlement.getDefaults());

        sDefaults.putAll(Gps.getDefaults());

        sDefaults.putIntArray(KEY_CDMA_ENHANCED_ROAMING_INDICATOR_FOR_HOME_NETWORK_INT_ARRAY,