From b2b5255abf9e6a97db9919f3b72201968a244ea9 Mon Sep 17 00:00:00 2001 From: tomhsu Date: Wed, 30 Oct 2024 04:37:45 +0000 Subject: [PATCH] Fix Settings crash due to no SatelliteManager. Flag: EXEMPT bug fix Bug: 375962358 Test: make pass. Change-Id: I2894be2b8e2580ce35b0d34ca512992c576a1020 --- .../network/telephony/NetworkSelectRepository.kt | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/network/telephony/NetworkSelectRepository.kt b/src/com/android/settings/network/telephony/NetworkSelectRepository.kt index d95c90e5c19..219f9db6315 100644 --- a/src/com/android/settings/network/telephony/NetworkSelectRepository.kt +++ b/src/com/android/settings/network/telephony/NetworkSelectRepository.kt @@ -22,6 +22,7 @@ import android.telephony.CarrierConfigManager import android.telephony.NetworkRegistrationInfo import android.telephony.TelephonyManager import android.telephony.satellite.SatelliteManager +import android.util.Log import androidx.lifecycle.Lifecycle import androidx.lifecycle.LifecycleOwner import androidx.lifecycle.lifecycleScope @@ -92,6 +93,11 @@ class NetworkSelectRepository(context: Context, private val subId: Int) { * Update satellite PLMNs from the satellite framework. */ private fun getSatellitePlmns(): List { + if (satelliteManager == null) { + Log.d(TAG, "SatelliteManager is null") + return emptyList() + } + val config = carrierConfigManager.getConfigForSubId( subId, CarrierConfigManager.KEY_REMOVE_SATELLITE_PLMN_IN_MANUAL_NETWORK_SCAN_BOOL @@ -104,7 +110,11 @@ class NetworkSelectRepository(context: Context, private val subId: Int) { return if (shouldFilter) { satelliteManager.getSatellitePlmnsForCarrier(subId) } else { - emptyList(); + emptyList() } } + + private companion object { + private const val TAG = "NetworkSelectRepository" + } }