Use PhoneGlobals to get carrier config.
CarrierConfigLoader assumes init() will be called exactly once from
PhoneGlobals.java, so PhoneGlobals provides a helper to get config from
within package com.android.phone. Use that instead.
Bug: 22108473
Change-Id: Ieb3935195735f8b954e633763681654e850ac8b8
diff --git a/src/com/android/phone/EmergencyDialer.java b/src/com/android/phone/EmergencyDialer.java
index 303a384..8569693 100644
--- a/src/com/android/phone/EmergencyDialer.java
+++ b/src/com/android/phone/EmergencyDialer.java
@@ -200,10 +200,9 @@
mDialButton = findViewById(R.id.floating_action_button);
- CarrierConfigLoader configLoader = CarrierConfigLoader.init(this);
// Check whether we should show the onscreen "Dial" button and co.
- PersistableBundle carrierConfig =
- configLoader.getConfigForSubId(SubscriptionManager.getDefaultVoiceSubId());
+ PersistableBundle carrierConfig = PhoneGlobals.getInstance().getCarrierConfigForSubId(
+ SubscriptionManager.getDefaultVoiceSubId());
if (carrierConfig.getBoolean(CarrierConfigManager.KEY_SHOW_ONSCREEN_DIAL_BUTTON_BOOL)) {
mDialButton.setOnClickListener(this);
} else {