Merge "To avoid crash IllegalStateException" into main

2023-11-07 09:16:30 +00:00
parent e4aabf044a 5eae90d731
commit e60c9521c2
1 changed files with 8 additions and 4 deletions
--- a/src/com/android/settings/network/NetworkProviderSettings.java
+++ b/src/com/android/settings/network/NetworkProviderSettings.java
@@ -845,8 +845,10 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment
            return;
        }

+        if (isAdded()) {
            // update the menu item
            requireActivity().invalidateMenu();
+        }

        switch (wifiState) {
            case WifiManager.WIFI_STATE_ENABLED:
@@ -1480,9 +1482,11 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment
    @Override
    public void onAirplaneModeChanged(boolean isAirplaneModeOn) {
        updateAirplaneModeMsgPreference(isAirplaneModeOn /* visible */);
+        if (isAdded()) {
            // update the menu item
            requireActivity().invalidateMenu();
        }
+    }

    /**
     * A Wi-Fi preference for the connected Wi-Fi network without internet access.