[Telephony Mainline] Refactored more service manager calls
Bug: 142255256
Bug: 112725883
Test: Build
Change-Id: I0749c3ad6024f3532583027cfc2e99337205f62a
diff --git a/src/com/android/phone/CarrierConfigLoader.java b/src/com/android/phone/CarrierConfigLoader.java
index 3812b2f..0052cd0 100644
--- a/src/com/android/phone/CarrierConfigLoader.java
+++ b/src/com/android/phone/CarrierConfigLoader.java
@@ -39,13 +39,13 @@
import android.os.PersistableBundle;
import android.os.RemoteException;
import android.os.ResultReceiver;
-import android.os.ServiceManager;
import android.preference.PreferenceManager;
import android.service.carrier.CarrierIdentifier;
import android.service.carrier.CarrierService;
import android.service.carrier.ICarrierService;
import android.telephony.CarrierConfigManager;
import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyFrameworkInitializer;
import android.telephony.TelephonyManager;
import android.util.LocalLog;
import android.util.Log;
@@ -539,7 +539,8 @@
mServiceConnection = new CarrierServiceConnection[numPhones];
mHasSentConfigChange = new boolean[numPhones];
// Make this service available through ServiceManager.
- ServiceManager.addService(Context.CARRIER_CONFIG_SERVICE, this);
+ TelephonyFrameworkInitializer
+ .getTelephonyServiceManager().getCarrierConfigServiceRegisterer().register(this);
log("CarrierConfigLoader has started");
mSubscriptionInfoUpdater = PhoneFactory.getSubscriptionInfoUpdater();
mHandler.sendEmptyMessage(EVENT_CHECK_SYSTEM_UPDATE);
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);
}
/**
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) {
diff --git a/tests/src/com/android/phone/tests/CallDialTest.java b/tests/src/com/android/phone/tests/CallDialTest.java
index b30f5b2..6e78be0 100644
--- a/tests/src/com/android/phone/tests/CallDialTest.java
+++ b/tests/src/com/android/phone/tests/CallDialTest.java
@@ -22,9 +22,9 @@
import android.net.Uri;
import android.os.Bundle;
import android.os.RemoteException;
-import android.os.ServiceManager;
import android.telecom.PhoneAccount;
import android.telephony.PhoneNumberUtils;
+import android.telephony.TelephonyFrameworkInitializer;
import android.text.TextUtils;
import android.util.Log;
import android.view.View;
@@ -155,7 +155,11 @@
log("==> number: '" + number + "'");
try {
- ITelephony phone = ITelephony.Stub.asInterface(ServiceManager.checkService("phone"));
+ ITelephony phone = ITelephony.Stub.asInterface(
+ TelephonyFrameworkInitializer
+ .getTelephonyServiceManager()
+ .getTelephonyServiceRegisterer()
+ .get());
log("- phone: " + phone);
log("- calling call()...");
phone.call(getPackageName(), number);
@@ -173,7 +177,11 @@
log("==> number: '" + number + "'");
try {
- ITelephony phone = ITelephony.Stub.asInterface(ServiceManager.checkService("phone"));
+ ITelephony phone = ITelephony.Stub.asInterface(
+ TelephonyFrameworkInitializer
+ .getTelephonyServiceManager()
+ .getTelephonyServiceRegisterer()
+ .get());
log("- phone: " + phone);
log("- calling dial()...");
phone.dial(number);