Merge "Move CarrierConfigLoader registrar call to init"
diff --git a/src/com/android/phone/CarrierConfigLoader.java b/src/com/android/phone/CarrierConfigLoader.java
index d5b697a..577d2c0 100644
--- a/src/com/android/phone/CarrierConfigLoader.java
+++ b/src/com/android/phone/CarrierConfigLoader.java
@@ -706,9 +706,6 @@
mFromSystemUnlocked = new boolean[numPhones];
mServiceConnectionForNoSimConfig = new CarrierServiceConnection[numPhones];
mServiceBoundForNoSimConfig = new boolean[numPhones];
- // Make this service available through ServiceManager.
- TelephonyFrameworkInitializer
- .getTelephonyServiceManager().getCarrierConfigServiceRegisterer().register(this);
logd("CarrierConfigLoader has started");
mSubscriptionInfoUpdater = subscriptionInfoUpdater;
mHandler.sendEmptyMessage(EVENT_CHECK_SYSTEM_UPDATE);
@@ -724,6 +721,9 @@
if (sInstance == null) {
sInstance = new CarrierConfigLoader(context,
PhoneFactory.getSubscriptionInfoUpdater(), Looper.myLooper());
+ // Make this service available through ServiceManager.
+ TelephonyFrameworkInitializer.getTelephonyServiceManager()
+ .getCarrierConfigServiceRegisterer().register(sInstance);
} else {
Log.wtf(LOG_TAG, "init() called multiple times! sInstance = " + sInstance);
}
diff --git a/tests/src/com/android/phone/CarrierConfigLoaderTest.java b/tests/src/com/android/phone/CarrierConfigLoaderTest.java
index f58e6cc..9c605da 100644
--- a/tests/src/com/android/phone/CarrierConfigLoaderTest.java
+++ b/tests/src/com/android/phone/CarrierConfigLoaderTest.java
@@ -133,6 +133,7 @@
public void tearDown() throws Exception {
mContext.revokeAllPermissions();
mTestableLooper.destroy();
+ mHandlerThread.quit();
super.tearDown();
}