Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b2b5255a authored by tomhsu's avatar tomhsu
Browse files

Fix Settings crash due to no SatelliteManager. 

Flag: EXEMPT bug fix
Bug: 375962358
Test: make pass.
Change-Id: I2894be2b8e2580ce35b0d34ca512992c576a1020
parent 4d19f455

src/com/android/settings/network/telephony/NetworkSelectRepository.kt

+11 −1
Original line number Diff line number Diff line
@@ -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<String> {

        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"

    }

}