commit c035ce4af56560d43eca74a02a41564ddfcb5ee2
author Peter Wang <tpwang@google.com> Wed Jan 08 21:00:22 2020 -0800
committer Peter Wang <tpwang@google.com> Thu Jan 09 11:03:14 2020 -0800
tree dcc4652185dacadf8a21779e53a6ed878e14d590
parent f03be75c50ba3431b7415f8b970c0afc5e893d50

[Telephony Mainline] Refactored more service manager calls

Bug: 142255256
Bug: 112725883
Test: Build
Change-Id: I0749c3ad6024f3532583027cfc2e99337205f62a

src/com/android/phone/ImsRcsController.java

diff --git a/src/com/android/phone/ImsRcsController.java b/src/com/android/phone/ImsRcsController.java
index 06d2367..ee034c0 100644
--- a/src/com/android/phone/ImsRcsController.java
+++ b/src/com/android/phone/ImsRcsController.java
@@ -16,12 +16,11 @@
 
 package com.android.phone;
 
-import android.content.Context;
 import android.net.Uri;
 import android.os.Binder;
 import android.os.RemoteException;
-import android.os.ServiceManager;
 import android.os.ServiceSpecificException;
+import android.telephony.TelephonyFrameworkInitializer;
 import android.telephony.ims.ImsException;
 import android.telephony.ims.aidl.IImsCapabilityCallback;
 import android.telephony.ims.aidl.IImsRcsController;
@@ -66,7 +65,8 @@
     private ImsRcsController(PhoneGlobals app) {
         Log.i(TAG, "ImsRcsController");
         mApp = app;
-        ServiceManager.addService(Context.TELEPHONY_IMS_SERVICE, this);
+        TelephonyFrameworkInitializer
+                .getTelephonyServiceManager().getTelephonyImsServiceRegisterer().register(this);
     }
 
     /**