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

Merge "APNs missing while numeric is null" into main

Browse Source
This commit is contained in:
Charlotte Lu
2023-11-21 05:32:12 +00:00
committed by Android (Google) Code Review
parent 8c0042fbf7 276f30e3b0
commit 6bb2c73579
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -72,6 +72,9 @@ data class ApnData(
val customizedConfig: CustomizedConfig = CustomizedConfig() val customizedConfig: CustomizedConfig = CustomizedConfig()
) { ) {
fun getContentValues(context: Context): ContentValues { fun getContentValues(context: Context): ContentValues {
val simCarrierId =
context.getSystemService(TelephonyManager::class.java)!!.createForSubscriptionId(subId)
.getSimCarrierId()
val values = ContentValues() val values = ContentValues()
values.put(Telephony.Carriers.NAME, name) values.put(Telephony.Carriers.NAME, name)
values.put(Telephony.Carriers.APN, apn) values.put(Telephony.Carriers.APN, apn)
@@ -93,6 +96,7 @@ data class ApnData(
values.put(Telephony.Carriers.NETWORK_TYPE_BITMASK, networkType) values.put(Telephony.Carriers.NETWORK_TYPE_BITMASK, networkType)
values.put(Telephony.Carriers.CARRIER_ENABLED, apnEnable) values.put(Telephony.Carriers.CARRIER_ENABLED, apnEnable)
values.put(Telephony.Carriers.EDITED_STATUS, Telephony.Carriers.USER_EDITED) values.put(Telephony.Carriers.EDITED_STATUS, Telephony.Carriers.USER_EDITED)
values.put(Telephony.Carriers.CARRIER_ID, simCarrierId)
return values return values
} }
} }