commit 276f30e3b06c1ffbee2333b96aeb90dab19a304b
author Charlotte Lu <charlottelu@google.com> Mon Nov 20 19:18:51 2023 +0800
committer Charlotte Lu <charlottelu@google.com> Mon Nov 20 11:23:46 2023 +0000
tree a08b2cd44dadac7b06d037a7c871aa602dd0a8a2
parent e43645952f4b510443430004871b02d34cf1bf79

APNs missing while numeric is null

Test: Visual Test
Fix: 312142091
Change-Id: I1920e3e2dd534d385d0282295e0c3680051d4728

src/com/android/settings/network/apn/ApnStatus.kt

diff --git a/src/com/android/settings/network/apn/ApnStatus.kt b/src/com/android/settings/network/apn/ApnStatus.kt
index 3ccd71e..a633f41 100644
--- a/src/com/android/settings/network/apn/ApnStatus.kt
+++ b/src/com/android/settings/network/apn/ApnStatus.kt
@@ -72,6 +72,9 @@
     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)
@@ -93,6 +96,7 @@
         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)
         return values
     }
 }