Merge "To avoid crash IllegalStateException" into main

This commit is contained in:
SongFerng Wang
2023-11-07 09:16:30 +00:00
committed by Android (Google) Code Review

View File

@@ -845,8 +845,10 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment
return; return;
} }
if (isAdded()) {
// update the menu item // update the menu item
requireActivity().invalidateMenu(); requireActivity().invalidateMenu();
}
switch (wifiState) { switch (wifiState) {
case WifiManager.WIFI_STATE_ENABLED: case WifiManager.WIFI_STATE_ENABLED:
@@ -1480,9 +1482,11 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment
@Override @Override
public void onAirplaneModeChanged(boolean isAirplaneModeOn) { public void onAirplaneModeChanged(boolean isAirplaneModeOn) {
updateAirplaneModeMsgPreference(isAirplaneModeOn /* visible */); updateAirplaneModeMsgPreference(isAirplaneModeOn /* visible */);
if (isAdded()) {
// update the menu item // update the menu item
requireActivity().invalidateMenu(); requireActivity().invalidateMenu();
} }
}
/** /**
* A Wi-Fi preference for the connected Wi-Fi network without internet access. * A Wi-Fi preference for the connected Wi-Fi network without internet access.