From a9002d157caed26b3e746ff382d6f702c200827f Mon Sep 17 00:00:00 2001
From: hoffc <quic_hoffc@quicinc.com>
Date: Tue, 22 Oct 2024 09:27:35 +0800
Subject: [PATCH] Fix force close for updating UI after activity destroyed.

If activity is finishing or destroyed, getting activity context will return null results in settings app force close.

Do not call scan callback if network select activity is finishing or destroyed.

Test: build pass and run NetworkSelectSettingsTest unit test pass.

Bug: 372123288
Change-Id: I28307490c75fe04d54dcf1637f33f4b9ba1fe635
---
 .../settings/network/telephony/NetworkSelectSettings.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/settings/network/telephony/NetworkSelectSettings.java b/src/com/android/settings/network/telephony/NetworkSelectSettings.java
index a16f4b5d2d7..4ae51ab1493 100644
--- a/src/com/android/settings/network/telephony/NetworkSelectSettings.java
+++ b/src/com/android/settings/network/telephony/NetworkSelectSettings.java
@@ -219,7 +219,7 @@ public class NetworkSelectSettings extends DashboardFragment {
         setProgressBarVisible(true);
         mNetworkScanJob = mNetworkScanRepository.launchNetworkScan(getViewLifecycleOwner(),
                 (networkScanResult) -> {
-                    if (isPreferenceScreenEnabled()) {
+                    if (isPreferenceScreenEnabled() && !isFinishingOrDestroyed()) {
                         scanResultHandler(networkScanResult);
                     }