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/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index c8ff261..f8a44e2 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -51,7 +51,6 @@
 import android.os.PersistableBundle;
 import android.os.RemoteException;
 import android.os.ResultReceiver;
-import android.os.ServiceManager;
 import android.os.ServiceSpecificException;
 import android.os.UserHandle;
 import android.os.UserManager;
@@ -89,6 +88,7 @@
 import android.telephony.SignalStrength;
 import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyFrameworkInitializer;
 import android.telephony.TelephonyHistogram;
 import android.telephony.TelephonyManager;
 import android.telephony.TelephonyScanManager;
@@ -1412,7 +1412,10 @@
     private void publish() {
         if (DBG) log("publish: " + this);
 
-        ServiceManager.addService("phone", this);
+        TelephonyFrameworkInitializer
+                .getTelephonyServiceManager()
+                .getTelephonyServiceRegisterer()
+                .register(this);
     }
 
     private Phone getPhoneFromRequest(MainThreadRequest request) {