Disable Wi-Fi Calling when getting "registration error" intent.

Bug: 19698057
Change-Id: I403417e08f84014fb9bd9f213fd2b8644e2a6541
This commit is contained in:
Pavel Zhamaitsiak
2015-03-12 15:29:11 -07:00
parent 1e034fe79a
commit e8616913b4

View File

@@ -118,7 +118,7 @@ public class WifiCallingSettings extends SettingsPreferenceFragment
@Override @Override
public void onReceive(Context context, Intent intent) { public void onReceive(Context context, Intent intent) {
String action = intent.getAction(); String action = intent.getAction();
if (action.equals(ImsPhone.REGISTRATION_ERROR)) { if (action.equals(ImsManager.ACTION_IMS_REGISTRATION_ERROR)) {
// If this fragment is active then we are immediately // If this fragment is active then we are immediately
// showing alert on screen. There is no need to add // showing alert on screen. There is no need to add
// notification in this case. // notification in this case.
@@ -127,6 +127,9 @@ public class WifiCallingSettings extends SettingsPreferenceFragment
// not show notification, we are changing result code here. // not show notification, we are changing result code here.
setResultCode(Activity.RESULT_CANCELED); setResultCode(Activity.RESULT_CANCELED);
// UX requirement is to disable WFC in case of "permanent" registration failures.
mSwitch.setChecked(false);
showAlert(intent); showAlert(intent);
} }
} }
@@ -142,7 +145,7 @@ public class WifiCallingSettings extends SettingsPreferenceFragment
mButtonWfcMode.setOnPreferenceChangeListener(this); mButtonWfcMode.setOnPreferenceChangeListener(this);
mIntentFilter = new IntentFilter(); mIntentFilter = new IntentFilter();
mIntentFilter.addAction(ImsPhone.REGISTRATION_ERROR); mIntentFilter.addAction(ImsManager.ACTION_IMS_REGISTRATION_ERROR);
} }
@Override @Override