PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[Apn] Copy network type into lingering network type" into main

Browse Source
This commit is contained in:
Chaohui Wang
2024-06-04 10:16:13 +00:00
committed by Android (Google) Code Review
parent 035efe6207 57956a8bb8
commit 28f51a934a
2 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/network/apn/ApnStatus.kt
View File

@@ -70,6 +70,8 @@ data class ApnData(
Telephony.Carriers.ROAMING_PROTOCOL to context.convertOptions2Protocol(apnRoaming), Telephony.Carriers.ROAMING_PROTOCOL to context.convertOptions2Protocol(apnRoaming),
Telephony.Carriers.TYPE to apnType, Telephony.Carriers.TYPE to apnType,
Telephony.Carriers.NETWORK_TYPE_BITMASK to networkType, Telephony.Carriers.NETWORK_TYPE_BITMASK to networkType,
// Copy network type into lingering network type.
Telephony.Carriers.LINGERING_NETWORK_TYPE_BITMASK to networkType,
Telephony.Carriers.CARRIER_ENABLED to apnEnable, Telephony.Carriers.CARRIER_ENABLED to apnEnable,
Telephony.Carriers.EDITED_STATUS to Telephony.Carriers.USER_EDITED, Telephony.Carriers.EDITED_STATUS to Telephony.Carriers.USER_EDITED,
) )

15
tests/spa_unit/src/com/android/settings/network/apn/ApnStatusTest.kt
View File

@@ -16,9 +16,12 @@
package com.android.settings.network.apn package com.android.settings.network.apn
import android.content.Context
import android.os.PersistableBundle import android.os.PersistableBundle
import android.provider.Telephony import android.provider.Telephony
import android.telephony.CarrierConfigManager import android.telephony.CarrierConfigManager
import android.telephony.TelephonyManager
import androidx.test.core.app.ApplicationProvider
import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.ext.junit.runners.AndroidJUnit4
import com.google.common.truth.Truth.assertThat import com.google.common.truth.Truth.assertThat
import org.junit.Test import org.junit.Test
@@ -46,6 +49,8 @@ class ApnStatusTest {
} doReturn p } doReturn p
} }
private val context: Context = ApplicationProvider.getApplicationContext()
@Test @Test
fun getCarrierCustomizedConfig_test() { fun getCarrierCustomizedConfig_test() {
assert(getCarrierCustomizedConfig(apnData, configManager).isAddApnAllowed) assert(getCarrierCustomizedConfig(apnData, configManager).isAddApnAllowed)
@@ -81,4 +86,14 @@ class ApnStatusTest {
assertThat(apnData.isFieldEnabled(Telephony.Carriers.PROXY)).isFalse() assertThat(apnData.isFieldEnabled(Telephony.Carriers.PROXY)).isFalse()
assertThat(apnData.isFieldEnabled(Telephony.Carriers.APN)).isTrue() assertThat(apnData.isFieldEnabled(Telephony.Carriers.APN)).isTrue()
} }
@Test
fun getContentValueMap_copyNetworkTypeIntoLingeringNetworkType() {
val apnData = ApnData(networkType = TelephonyManager.NETWORK_TYPE_NR.toLong())
val contentValueMap = apnData.getContentValueMap(context)
assertThat(contentValueMap.getValue(Telephony.Carriers.LINGERING_NETWORK_TYPE_BITMASK))
.isEqualTo(TelephonyManager.NETWORK_TYPE_NR.toLong())
}
} }