From 5eae90d7315da44a5941c56207f89a03e47b3906 Mon Sep 17 00:00:00 2001
From: SongFerngWang <songferngwang@google.com>
Date: Tue, 7 Nov 2023 15:57:11 +0800
Subject: [PATCH] To avoid crash IllegalStateException

Bug: 308855978
Test: [pass]make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest
Change-Id: Ia0a1cbe0326e63b878c3fe7797ca47e25ccc16d4
---
 .../settings/network/NetworkProviderSettings.java    | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/com/android/settings/network/NetworkProviderSettings.java b/src/com/android/settings/network/NetworkProviderSettings.java
index b4de224d17f..d5bc2af2be1 100644
--- 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;
         }
 
-        // update the menu item
-        requireActivity().invalidateMenu();
+        if (isAdded()) {
+            // update the menu item
+            requireActivity().invalidateMenu();
+        }
 
         switch (wifiState) {
             case WifiManager.WIFI_STATE_ENABLED:
@@ -1480,8 +1482,10 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment
     @Override
     public void onAirplaneModeChanged(boolean isAirplaneModeOn) {
         updateAirplaneModeMsgPreference(isAirplaneModeOn /* visible */);
-        // update the menu item
-        requireActivity().invalidateMenu();
+        if (isAdded()) {
+            // update the menu item
+            requireActivity().invalidateMenu();
+        }
     }
 
     /**