From dae4c04b74fa1054949eb6c348a9641a535cdff6 Mon Sep 17 00:00:00 2001 From: Chaohui Wang Date: Tue, 23 Apr 2024 17:22:24 +0800 Subject: [PATCH] Get icon id from CellIdentity instead of CellInfo Currently NetworkSelectSettings.forceUpdateConnectedPreferenceCategory() only pass CellIdentity, but not the CellInfo. Get icon id from CellIdentity to fix. Fix: 336238346 Test: visual - on NetworkSelectSettings Change-Id: Ia30a45eef9d55815c8a45629c86cf83a6a480868 --- .../telephony/NetworkOperatorPreference.kt | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/com/android/settings/network/telephony/NetworkOperatorPreference.kt b/src/com/android/settings/network/telephony/NetworkOperatorPreference.kt index c696ef13315..7f42400fe85 100644 --- a/src/com/android/settings/network/telephony/NetworkOperatorPreference.kt +++ b/src/com/android/settings/network/telephony/NetworkOperatorPreference.kt @@ -19,6 +19,12 @@ package com.android.settings.network.telephony import android.content.Context import android.telephony.AccessNetworkConstants.AccessNetworkType import android.telephony.CellIdentity +import android.telephony.CellIdentityCdma +import android.telephony.CellIdentityGsm +import android.telephony.CellIdentityLte +import android.telephony.CellIdentityNr +import android.telephony.CellIdentityTdscdma +import android.telephony.CellIdentityWcdma import android.telephony.CellInfo import android.telephony.CellInfoCdma import android.telephony.CellInfoGsm @@ -120,17 +126,17 @@ open class NetworkOperatorPreference( getAccessNetworkTypeFromCellInfo(), ) - private fun getIconIdForCell(): Int = when (cellInfo) { - is CellInfoGsm -> R.drawable.signal_strength_g - is CellInfoCdma -> R.drawable.signal_strength_1x - is CellInfoWcdma, is CellInfoTdscdma -> R.drawable.signal_strength_3g + private fun getIconIdForCell(): Int = when (cellId) { + is CellIdentityGsm -> R.drawable.signal_strength_g + is CellIdentityCdma -> R.drawable.signal_strength_1x + is CellIdentityWcdma, is CellIdentityTdscdma -> R.drawable.signal_strength_3g - is CellInfoLte -> { + is CellIdentityLte -> { if (show4GForLTE) R.drawable.ic_signal_strength_4g else R.drawable.signal_strength_lte } - is CellInfoNr -> R.drawable.signal_strength_5g + is CellIdentityNr -> R.drawable.signal_strength_5g else -> MobileNetworkUtils.NO_CELL_DATA_TYPE_ICON }