From 33c6221c5bf0bf966cd6f2da956c1b566be54ce4 Mon Sep 17 00:00:00 2001
From: Meng Wang <mewan@google.com>
Date: Mon, 13 Dec 2021 19:04:25 +0000
Subject: 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
---
 telephony/java/android/telephony/CarrierConfigManager.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java
index 9c9e41b64892..b8a14b8ea72e 100644
--- a/telephony/java/android/telephony/CarrierConfigManager.java
+++ b/telephony/java/android/telephony/CarrierConfigManager.java
@@ -5794,6 +5794,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[] {
-- 
cgit v1.2.3