commit 248b8fd7bf46c80d06e36aa9328c6fd0e0d326ce
author Pavel Zhamaitsiak <pavelz@google.com> Mon Mar 09 16:58:39 2015 -0700
committer Pavel Zhamaitsiak <pavelz@google.com> Mon Mar 09 16:58:39 2015 -0700
tree c6422fa21384bf1d63a5723bf0ccc42b6d0cc9c6
parent 71099329cc0443ce4517480c86f81ed6b4e33ff2

Update Wi-Fi Calling mode when WFC is enabled/disabled

Bug: 19644042
Change-Id: Ie9cfe8c7f416985e4f78d48159d83191a19ac599

src/com/android/settings/WifiCallingSettings.java

diff --git a/src/com/android/settings/WifiCallingSettings.java b/src/com/android/settings/WifiCallingSettings.java
index 2e8fb74..23fc2ea 100644
--- a/src/com/android/settings/WifiCallingSettings.java
+++ b/src/com/android/settings/WifiCallingSettings.java
@@ -137,7 +137,7 @@
 
         int wfcMode = ImsManager.getWfcMode(context);
         mButtonWfcMode.setValue(Integer.toString(wfcMode));
-        mButtonWfcMode.setSummary(getWfcModeSummary(context, ImsManager.getWfcMode(context)));
+        mButtonWfcMode.setSummary(getWfcModeSummary(context, wfcMode));
 
         mButtonWfcRoam.setChecked(wfcEnabled
                 && (wfcMode != ImsConfig.WfcModeFeatureValueConstants.WIFI_ONLY)
@@ -165,9 +165,10 @@
 
         ImsManager.setWfcSetting(context, isChecked);
 
+        int wfcMode = ImsManager.getWfcMode(context);
+        mButtonWfcMode.setSummary(getWfcModeSummary(context, wfcMode));
         mButtonWfcMode.setEnabled(isChecked);
-        boolean wfcHandoffEnabled = (ImsManager.getWfcMode(context)
-                != ImsConfig.WfcModeFeatureValueConstants.WIFI_ONLY);
+        boolean wfcHandoffEnabled = (wfcMode != ImsConfig.WfcModeFeatureValueConstants.WIFI_ONLY);
         mButtonWfcRoam.setEnabled(isChecked && wfcHandoffEnabled);
         mButtonWfcRoam.setChecked(isChecked && wfcHandoffEnabled
                 && ImsManager.isWfcRoamingEnabledByUser(context));