Merge "To avoid crash IllegalStateException" into main
This commit is contained in:
committed by
Android (Google) Code Review
commit
e60c9521c2
@@ -845,8 +845,10 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// update the menu item
|
if (isAdded()) {
|
||||||
requireActivity().invalidateMenu();
|
// update the menu item
|
||||||
|
requireActivity().invalidateMenu();
|
||||||
|
}
|
||||||
|
|
||||||
switch (wifiState) {
|
switch (wifiState) {
|
||||||
case WifiManager.WIFI_STATE_ENABLED:
|
case WifiManager.WIFI_STATE_ENABLED:
|
||||||
@@ -1480,8 +1482,10 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment
|
|||||||
@Override
|
@Override
|
||||||
public void onAirplaneModeChanged(boolean isAirplaneModeOn) {
|
public void onAirplaneModeChanged(boolean isAirplaneModeOn) {
|
||||||
updateAirplaneModeMsgPreference(isAirplaneModeOn /* visible */);
|
updateAirplaneModeMsgPreference(isAirplaneModeOn /* visible */);
|
||||||
// update the menu item
|
if (isAdded()) {
|
||||||
requireActivity().invalidateMenu();
|
// update the menu item
|
||||||
|
requireActivity().invalidateMenu();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
Reference in New Issue
Block a user