Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6a6b1fa6 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "ImsServiceEntitlement default values missing" am: 14c8d5f0 

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

Change-Id: Iece121724d392b3b5199d6556e6d7adb4a6c1333
parents 90e458ba 14c8d5f0

telephony/java/android/telephony/CarrierConfigManager.java

+1 −0
Original line number Diff line number Diff line
@@ -5821,6 +5821,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[] {