commit 14c8d5f0a6693e3bc066a45845c959a86c48047c
author Treehugger Robot <treehugger-gerrit@google.com> Tue Dec 14 03:09:15 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Dec 14 03:09:15 2021 +0000
tree 54a012336a3fd259339cbbc2ba180cf1065e9376
parent 5b78f171ec13116ae41221a827877c0c53f27e4e
parent ea1adfc0e51029bf420d998e4c862f954021035c

Merge "ImsServiceEntitlement default values missing"

telephony/java/android/telephony/CarrierConfigManager.java

diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java
index 5ffe45f..d3fc033 100644
--- a/telephony/java/android/telephony/CarrierConfigManager.java
+++ b/telephony/java/android/telephony/CarrierConfigManager.java
@@ -5821,6 +5821,7 @@
         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[] {