commit b083196e76e88018df6aa6cf18fe7e74ac2c1141
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon Oct 21 04:11:01 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Oct 21 04:11:01 2024 +0000
tree 27a2c0b2adb24bdfee2ed4a7de1c720e43169ff3
parent f233e5076669e250368df79e301466099d1067a2
parent 2545f06558bebe579bce98b5e81139423d131d2f

Merge "Fix force close for updating UI after activity destroyed." into main

src/com/android/settings/network/telephony/NetworkSelectSettings.java

diff --git a/src/com/android/settings/network/telephony/NetworkSelectSettings.java b/src/com/android/settings/network/telephony/NetworkSelectSettings.java
index a16f4b5..a3485cd 100644
--- a/src/com/android/settings/network/telephony/NetworkSelectSettings.java
+++ b/src/com/android/settings/network/telephony/NetworkSelectSettings.java
@@ -368,6 +368,11 @@
 
     @VisibleForTesting
     protected void scanResultHandler(NetworkScanRepository.NetworkScanResult results) {
+        if (isFinishingOrDestroyed()) {
+            Log.d(TAG, "scanResultHandler: activity isFinishingOrDestroyed, directly return");
+            return;
+        }
+
         mCellInfoList = filterOutSatellitePlmn(results.getCellInfos());
         Log.d(TAG, "CellInfoList: " + CellInfoUtil.cellInfoListToString(mCellInfoList));
         updateAllPreferenceCategory();