Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix default value type : should be long instead of int .." am: 061654bdc3 am: ea1c39cede am: 6c7a850439 am: 47ee8d38a4

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

Change-Id: I4573004b3c6e56c0157a7c937e00174cb4fcb84a
This commit is contained in:
Treehugger Robot
2022-01-18 18:11:55 +00:00
committed by Automerger Merge Worker
parent db5e27a5fe 47ee8d38a4
commit a26e957b9b
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
telephony/java/android/telephony/CarrierConfigManager.java
View File

@@ -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,