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

Merge "APNs missing while numeric is null in add mode." into main

Browse Source
This commit is contained in:
Charlotte Lu
2023-11-21 09:17:43 +00:00
committed by Android (Google) Code Review
parent bfd3806613 3a1252a6d5
commit 3fd6397a72
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -72,9 +72,6 @@ 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)
@@ -96,7 +93,12 @@ 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) if (newApn) {
val simCarrierId =
context.getSystemService(TelephonyManager::class.java)!!.createForSubscriptionId(subId)
.getSimCarrierId()
values.put(Telephony.Carriers.CARRIER_ID, simCarrierId)
}
return values return values
} }
} }