commit d9eebca1c2e5d32473887efe2e39ab47d892fbc1
author Peter Wang <tpwang@google.com> Mon Dec 30 16:14:01 2019 -0800
committer Peter Wang <tpwang@google.com> Tue Jan 07 16:11:47 2020 -0800
tree 51b72f448cd5553232b02631a22895c6d16f4696
parent 9498a10f6cb3789b7cd094b4b032daf3e6cc7e87

[Telephony Mainline] Refactored ServiceManager calls

to use TelephonyServiceManager

Bug: 142255256
Bug: 112725883
Test: Build, SimSmsTest, TelephonyRegistryTest, SimPhoneBookTest, OpportunisticNetworkServiceTest
Change-Id: I50068a02f1f5a4ff51acdbe4d1ded09ec4c4d6b8

telephony/java/android/telephony/CarrierConfigManager.java

diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java
index fdf8849..5baddef 100755
--- a/telephony/java/android/telephony/CarrierConfigManager.java
+++ b/telephony/java/android/telephony/CarrierConfigManager.java
@@ -29,7 +29,6 @@
 import android.content.Context;
 import android.os.PersistableBundle;
 import android.os.RemoteException;
-import android.os.ServiceManager;
 import android.service.carrier.CarrierService;
 import android.telecom.TelecomManager;
 import android.telephony.ims.ImsReasonInfo;
@@ -4205,8 +4204,11 @@
     /** @hide */
     @Nullable
     private ICarrierConfigLoader getICarrierConfigLoader() {
-        return ICarrierConfigLoader.Stub
-                .asInterface(ServiceManager.getService(Context.CARRIER_CONFIG_SERVICE));
+        return ICarrierConfigLoader.Stub.asInterface(
+                TelephonyFrameworkInitializer
+                        .getTelephonyServiceManager()
+                        .getCarrierConfigServiceRegisterer()
+                        .get());
     }
 
     /**