From 2545f06558bebe579bce98b5e81139423d131d2f Mon Sep 17 00:00:00 2001
From: hoffc <quic_hoffc@quicinc.com>
Date: Tue, 8 Oct 2024 17:29:32 +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.

Directly return if network select activity is finishing or destroyed when handling network scan callback.

Bug: 372123288
Change-Id: Ia8c89569761b66da58cafd0140ceda29ac7d678c
---
 .../settings/network/telephony/NetworkSelectSettings.java    | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/com/android/settings/network/telephony/NetworkSelectSettings.java b/src/com/android/settings/network/telephony/NetworkSelectSettings.java
index a16f4b5d2d7..a3485cd6c3a 100644
--- a/src/com/android/settings/network/telephony/NetworkSelectSettings.java
+++ b/src/com/android/settings/network/telephony/NetworkSelectSettings.java
@@ -368,6 +368,11 @@ public class NetworkSelectSettings extends DashboardFragment {
 
     @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();