PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
automerge: e861691

* commit 'e8616913b43d9356b5556dd0f2cab72d8ab4e875':
  Disable Wi-Fi Calling when getting "registration error" intent.
This commit is contained in:
Pavel Zhamaitsiak
2015-03-18 18:45:15 +00:00
committed by android-build-merger
parent ad68507072 e8616913b4
commit 035619826b
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/WifiCallingSettings.java
View File

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