commit 4e305cf9c7d19976a167dd26b93d08ae449aecb7
author Meng Wang <mewan@google.com> Mon Feb 27 18:34:34 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Feb 27 18:34:34 2017 +0000
tree 77dd4e6725630deb73cd54b49635a96fac015750
parent 0497ee9731a1fa50b0fd957dec1299cfed61080d
parent 556e3bb3e870e877564defcdcfbca07f478968e0

Merge "WiFiCallingSettings: don't start carrier app in onResume" am: 05c88316ec am: e21cbcb6b4
am: 556e3bb3e8

Change-Id: I1a189c49f1ca8c0a8c12f1c834d90f61d25fc470

src/com/android/settings/WifiCallingSettings.java

diff --git a/src/com/android/settings/WifiCallingSettings.java b/src/com/android/settings/WifiCallingSettings.java
index 196e4bd..78f9de6 100644
--- a/src/com/android/settings/WifiCallingSettings.java
+++ b/src/com/android/settings/WifiCallingSettings.java
@@ -252,15 +252,6 @@
 
         final Context context = getActivity();
 
-        if (ImsManager.isWfcEnabledByPlatform(context)) {
-            TelephonyManager tm = (TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE);
-            tm.listen(mPhoneStateListener, PhoneStateListener.LISTEN_CALL_STATE);
-
-            mSwitchBar.addOnSwitchChangeListener(this);
-
-            mValidListener = true;
-        }
-
         // NOTE: Buttons will be enabled/disabled in mPhoneStateListener
         boolean wfcEnabled = ImsManager.isWfcEnabledByUser(context)
                 && ImsManager.isNonTtyOrTtyOnVolteEnabled(context);
@@ -271,6 +262,15 @@
         mButtonWfcRoamingMode.setValue(Integer.toString(wfcRoamingMode));
         updateButtonWfcMode(context, wfcEnabled, wfcMode, wfcRoamingMode);
 
+        if (ImsManager.isWfcEnabledByPlatform(context)) {
+            TelephonyManager tm = (TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE);
+            tm.listen(mPhoneStateListener, PhoneStateListener.LISTEN_CALL_STATE);
+
+            mSwitchBar.addOnSwitchChangeListener(this);
+
+            mValidListener = true;
+        }
+
         context.registerReceiver(mIntentReceiver, mIntentFilter);
 
         Intent intent = getActivity().getIntent();