commit 1479dd1bc7465bac90141e654f91a9e724163c4a
author Andrew Lee <anwlee@google.com> Thu Nov 06 23:06:32 2014 -0800
committer Andrew Lee <anwlee@google.com> Fri Nov 07 00:13:04 2014 -0800
tree b9b81803f145c7726135fb68e0ba955b4052e786
parent cf4d1335a76296a2b1cc3880198d3d28c13924bd

Get Phone object using subscription id in Call settings.

This is a (small) incremental step towards MSIM voicemail settings.

Bug: 18232725
Bug: 18114923
Change-Id: Ie4c36125e839ed57c888c78770cfd4cb42739c3b

src/com/android/phone/CallFeaturesSetting.java

diff --git a/src/com/android/phone/CallFeaturesSetting.java b/src/com/android/phone/CallFeaturesSetting.java
index c99e432..59abb79 100644
--- a/src/com/android/phone/CallFeaturesSetting.java
+++ b/src/com/android/phone/CallFeaturesSetting.java
@@ -1207,7 +1207,6 @@
         super.onCreate(icicle);
         if (DBG) log("onCreate: Intent is " + getIntent());
 
-        mPhone = PhoneGlobals.getPhone();
         mAudioManager = (AudioManager) getSystemService(Context.AUDIO_SERVICE);
         mVmProviderSettingsUtil = new VoicemailProviderSettingsUtil(getApplicationContext());
 
@@ -1219,6 +1218,7 @@
         mSubscriptionInfoHelper = new SubscriptionInfoHelper(getIntent());
         mSubscriptionInfoHelper.setActionBarTitle(
                 getActionBar(), getResources(), R.string.call_settings_with_label);
+        mPhone = mSubscriptionInfoHelper.getPhone();
    }
 
     private void initPhoneAccountPreferences() {
@@ -1274,7 +1274,6 @@
                 (CheckBoxPreference) findPreference(BUTTON_VOICEMAIL_NOTIFICATION_VIBRATE_KEY);
         initVoiceMailProviders();
 
-
         if (getResources().getBoolean(R.bool.dtmf_type_enabled)) {
             mButtonDTMF.setOnPreferenceChangeListener(this);
             int dtmf = Settings.System.getInt(getContentResolver(),