commit c3ea626cd31b9b6c0a96c65b282881dad02db010
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue Oct 22 09:51:08 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Oct 22 09:51:08 2024 +0000
tree 923d45ac69d91b136934ba8ef44716e84d942924
parent 0583090e98ba8f937cf2cf62173867ecded2c37f
parent a9002d157caed26b3e746ff382d6f702c200827f

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..4ae51ab 100644
--- a/src/com/android/settings/network/telephony/NetworkSelectSettings.java
+++ b/src/com/android/settings/network/telephony/NetworkSelectSettings.java
@@ -219,7 +219,7 @@
         setProgressBarVisible(true);
         mNetworkScanJob = mNetworkScanRepository.launchNetworkScan(getViewLifecycleOwner(),
                 (networkScanResult) -> {
-                    if (isPreferenceScreenEnabled()) {
+                    if (isPreferenceScreenEnabled() && !isFinishingOrDestroyed()) {
                         scanResultHandler(networkScanResult);
                     }