From 3a1252a6d56ddf485b8f321ba22ec750769f67e2 Mon Sep 17 00:00:00 2001 From: Charlotte Lu Date: Tue, 21 Nov 2023 14:47:15 +0800 Subject: [PATCH] APNs missing while numeric is null in add mode. Test: Visual Test Fix: 312142091 Change-Id: I2b7d4580dcb3fda08ce8d147ed827ee4383befba --- src/com/android/settings/network/apn/ApnStatus.kt | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/com/android/settings/network/apn/ApnStatus.kt b/src/com/android/settings/network/apn/ApnStatus.kt index a633f416e03..4d5d9fbbeeb 100644 --- a/src/com/android/settings/network/apn/ApnStatus.kt +++ b/src/com/android/settings/network/apn/ApnStatus.kt @@ -72,9 +72,6 @@ data class ApnData( val customizedConfig: CustomizedConfig = CustomizedConfig() ) { fun getContentValues(context: Context): ContentValues { - val simCarrierId = - context.getSystemService(TelephonyManager::class.java)!!.createForSubscriptionId(subId) - .getSimCarrierId() val values = ContentValues() values.put(Telephony.Carriers.NAME, name) values.put(Telephony.Carriers.APN, apn) @@ -96,7 +93,12 @@ data class ApnData( values.put(Telephony.Carriers.NETWORK_TYPE_BITMASK, networkType) values.put(Telephony.Carriers.CARRIER_ENABLED, apnEnable) values.put(Telephony.Carriers.EDITED_STATUS, Telephony.Carriers.USER_EDITED) - values.put(Telephony.Carriers.CARRIER_ID, simCarrierId) + if (newApn) { + val simCarrierId = + context.getSystemService(TelephonyManager::class.java)!!.createForSubscriptionId(subId) + .getSimCarrierId() + values.put(Telephony.Carriers.CARRIER_ID, simCarrierId) + } return values } }