commit e137eed1d107249cf276fd1125463c7c6c540636
author Santos Cordon <santoscordon@google.com> Tue Jun 23 15:34:47 2015 -0700
committer Santos Cordon <santoscordon@google.com> Tue Jun 23 15:34:47 2015 -0700
tree a66b50732be2e0fb1498f99d7b536f8c045dfb90
parent 761fdfc8f95c8452f4e31ee8f39c92270a1b417d

EmergencyDialer should work on secondary users.

Bug: 21334821
Change-Id: I0af5911d9cb03837b66b98d9ef9999b494d606e9

src/com/android/phone/EmergencyDialer.java

diff --git a/src/com/android/phone/EmergencyDialer.java b/src/com/android/phone/EmergencyDialer.java
index 71557c6..303a384 100644
--- a/src/com/android/phone/EmergencyDialer.java
+++ b/src/com/android/phone/EmergencyDialer.java
@@ -34,6 +34,7 @@
 import android.telecom.PhoneAccount;
 import android.telephony.CarrierConfigManager;
 import android.telephony.PhoneNumberUtils;
+import android.telephony.SubscriptionManager;
 import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
@@ -199,8 +200,10 @@
 
         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 = PhoneGlobals.getInstance().getCarrierConfig();
+        PersistableBundle carrierConfig =
+                configLoader.getConfigForSubId(SubscriptionManager.getDefaultVoiceSubId());
         if (carrierConfig.getBoolean(CarrierConfigManager.KEY_SHOW_ONSCREEN_DIAL_BUTTON_BOOL)) {
             mDialButton.setOnClickListener(this);
         } else {