Fix Settings crash due to no SatelliteManager.

Flag: EXEMPT bug fix
Bug: 375962358
Test: make pass.
Change-Id: I2894be2b8e2580ce35b0d34ca512992c576a1020
This commit is contained in:
tomhsu
2024-10-30 04:37:45 +00:00
parent 4d19f45505
commit b2b5255abf

View File

@@ -22,6 +22,7 @@ import android.telephony.CarrierConfigManager
import android.telephony.NetworkRegistrationInfo import android.telephony.NetworkRegistrationInfo
import android.telephony.TelephonyManager import android.telephony.TelephonyManager
import android.telephony.satellite.SatelliteManager import android.telephony.satellite.SatelliteManager
import android.util.Log
import androidx.lifecycle.Lifecycle import androidx.lifecycle.Lifecycle
import androidx.lifecycle.LifecycleOwner import androidx.lifecycle.LifecycleOwner
import androidx.lifecycle.lifecycleScope import androidx.lifecycle.lifecycleScope
@@ -92,6 +93,11 @@ class NetworkSelectRepository(context: Context, private val subId: Int) {
* Update satellite PLMNs from the satellite framework. * Update satellite PLMNs from the satellite framework.
*/ */
private fun getSatellitePlmns(): List<String> { private fun getSatellitePlmns(): List<String> {
if (satelliteManager == null) {
Log.d(TAG, "SatelliteManager is null")
return emptyList()
}
val config = carrierConfigManager.getConfigForSubId( val config = carrierConfigManager.getConfigForSubId(
subId, subId,
CarrierConfigManager.KEY_REMOVE_SATELLITE_PLMN_IN_MANUAL_NETWORK_SCAN_BOOL 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) { return if (shouldFilter) {
satelliteManager.getSatellitePlmnsForCarrier(subId) satelliteManager.getSatellitePlmnsForCarrier(subId)
} else { } else {
emptyList(); emptyList()
} }
} }
private companion object {
private const val TAG = "NetworkSelectRepository"
}
} }