commit ea1adfc0e51029bf420d998e4c862f954021035c
author Meng Wang <mewan@google.com> Mon Dec 13 19:04:25 2021 +0000
committer Meng Wang <mewan@google.com> Mon Dec 13 23:35:41 2021 +0000
tree 67c18a9daf75bcb2b8c08370f2cc7185a4a2a24d
parent 6a8b9f396480d555dd5470a9025666597b4d6935

ImsServiceEntitlement default values missing

ImsServiceEntitlement.* configs and their default values
were added in S at
commit e600a8e4e8615410f2f45a4c35f2250d6b1b32b1.

Somehow the default values are missing now. Add back.

Bug: 210485357
Change-Id: I98d943394ed308956c5271b8efaa5094d15dc8ca
Merged-In: I98d943394ed308956c5271b8efaa5094d15dc8ca
(cherry picked from commit 33c6221c5bf0bf966cd6f2da956c1b566be54ce4)

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[] {