commit 7248d902780725cd7b96c093dfe80fcf2353f81c
author Anthony Lee <anthonylee@google.com> Fri Jun 26 20:02:17 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jun 26 20:02:18 2015 +0000
tree 2585272ce1a7f8129dab78872431f482b2138e54
parent e75bb5437539b67ce8ca1a7f006281249c5727c5
parent 5681491f535d15cbc8d45a8bb266c750385600d6

Merge "Use PhoneGlobals to get carrier config." into mnc-dev

src/com/android/phone/EmergencyDialer.java

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 {