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();