Merge "ImsServiceEntitlement default values missing" am: 14c8d5f0a6 am: 6a6b1fa6aa

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1921058 Change-Id: Ibb462d762260c71a3ecfa2497b3208314dea4dda
2021-12-14 03:34:40 +00:00
parent cf4aa582b1 6a6b1fa6aa
commit 2a1f1df5ed
1 changed files with 1 additions and 0 deletions
--- a/telephony/java/android/telephony/CarrierConfigManager.java
+++ b/telephony/java/android/telephony/CarrierConfigManager.java
@@ -5837,6 +5837,7 @@ public class CarrierConfigManager {
        sDefaults.putInt(
                KEY_OPPORTUNISTIC_TIME_TO_SCAN_AFTER_CAPABILITY_SWITCH_TO_PRIMARY_LONG,
                120000);
+        sDefaults.putAll(ImsServiceEntitlement.getDefaults());
        sDefaults.putAll(Gps.getDefaults());
        sDefaults.putIntArray(KEY_CDMA_ENHANCED_ROAMING_INDICATOR_FOR_HOME_NETWORK_INT_ARRAY,
                new int[] {