Merge "Donot disable Wi-Fi Calling when getting "registration error" intent." am: 4ec0e8e865

am: 9b282e231f

Change-Id: I95a108f4e6090b61e4584a64bed58c024e120fd0

src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java

@@ -203,9 +203,6 @@ public class WifiCallingSettingsForSub 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);
             }
         }