Merge "The UI is not immediately updated"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index dda89ee..1ee3882 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -12517,9 +12517,9 @@
<!-- Provider Model: Name for call settings category [CHAR LIMIT=NONE] -->
<string name="calls_and_sms_category">Wi\u2011Fi Calling</string>
<!-- Provider Model: Summary for calling preference -->
- <string name="calls_sms_wfc_summary">Make and receive calls over non\u2011carrier networks like Wi\u2011Fi</string>
+ <string name="calls_sms_wfc_summary">Make and receive calls over Wi\u2011Fi</string>
<!-- Provider Model: Label for footnote on calling preference -->
- <string name="calls_sms_footnote">Wi\u2011Fi calling allows you to make and receive calls over non\u2011carrier networks such as some Wi\u2011Fi networks.</string>
+ <string name="calls_sms_footnote">With Wi\u2011Fi calling, calls are made and received over non-carrier Wi\u2011Fi networks.</string>
<!-- Provider Model: Calls preference title -->
<string name="calls_preference_title">Calls</string>
<!-- Provider Model: SMS preference title -->
diff --git a/src/com/android/settings/network/NetworkProviderSettings.java b/src/com/android/settings/network/NetworkProviderSettings.java
index ae9b2d8..ebf59a2 100644
--- a/src/com/android/settings/network/NetworkProviderSettings.java
+++ b/src/com/android/settings/network/NetworkProviderSettings.java
@@ -1167,7 +1167,7 @@
getContext(), mRecoveryThread.getThreadHandler());
}
if (mConnectivitySubsystemsRecoveryManager.isRecoveryAvailable()) {
- mConnectivitySubsystemsRecoveryManager.triggerSubsystemRestart(TAG, this);
+ mConnectivitySubsystemsRecoveryManager.triggerSubsystemRestart(null /* reason */, this);
}
}