commit b7a0634a8e317bcc5be2d245dc5823e5b73e6d24
author Jonathan Basseri <misterikkit@google.com> Mon Jun 29 17:12:01 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jun 29 17:12:07 2015 +0000
tree d0c901a2ca89daae3dcc72effbe6852cad80c8d5
parent e06a87d338250a267ae904830ec8e1047253bc11
parent e619a4ce6af8d53ae24da5491e1dc01d93680478

Merge "Safely read 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 8569693..780f76b 100644
--- a/src/com/android/phone/EmergencyDialer.java
+++ b/src/com/android/phone/EmergencyDialer.java
@@ -201,8 +201,12 @@
         mDialButton = findViewById(R.id.floating_action_button);
 
         // Check whether we should show the onscreen "Dial" button and co.
-        PersistableBundle carrierConfig = PhoneGlobals.getInstance().getCarrierConfigForSubId(
-                SubscriptionManager.getDefaultVoiceSubId());
+        // Read carrier config through the public API because PhoneGlobals is not available when we
+        // run as a secondary user.
+        CarrierConfigManager configMgr =
+                (CarrierConfigManager) getSystemService(Context.CARRIER_CONFIG_SERVICE);
+        PersistableBundle carrierConfig =
+                configMgr.getConfigForSubId(SubscriptionManager.getDefaultVoiceSubId());
         if (carrierConfig.getBoolean(CarrierConfigManager.KEY_SHOW_ONSCREEN_DIAL_BUTTON_BOOL)) {
             mDialButton.setOnClickListener(this);
         } else {