Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Check HIDL Discriminator for CSG Info" into rvc-dev am: 4af4402121 am: 4ebfdc1b6d am: a14d8b1eee

Browse Source 
Change-Id: I8bb93387f1f2f4a9ee1e7a6b8cb3bab6f1726466
This commit is contained in:
Nathan Harold
2020-04-03 20:04:10 +00:00
committed by Automerger Merge Worker
parent 700a2a9325 a14d8b1eee
commit 970bb78fcf
3 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
telephony/java/android/telephony/CellIdentityLte.java
View File

@@ -153,8 +153,10 @@ public final class CellIdentityLte extends CellIdentity {
cid.bands.stream().mapToInt(Integer::intValue).toArray(), cid.base.bandwidth, cid.bands.stream().mapToInt(Integer::intValue).toArray(), cid.base.bandwidth,
cid.base.base.mcc, cid.base.base.mnc, cid.base.operatorNames.alphaLong, cid.base.base.mcc, cid.base.base.mnc, cid.base.operatorNames.alphaLong,
cid.base.operatorNames.alphaShort, cid.additionalPlmns, cid.base.operatorNames.alphaShort, cid.additionalPlmns,
cid.optionalCsgInfo.csgInfo() != null cid.optionalCsgInfo.getDiscriminator()
? new ClosedSubscriberGroupInfo(cid.optionalCsgInfo.csgInfo()) : null); == android.hardware.radio.V1_5.OptionalCsgInfo.hidl_discriminator.csgInfo
? new ClosedSubscriberGroupInfo(cid.optionalCsgInfo.csgInfo())
: null);
} }
private CellIdentityLte(@NonNull CellIdentityLte cid) { private CellIdentityLte(@NonNull CellIdentityLte cid) {

7
telephony/java/android/telephony/CellIdentityTdscdma.java
View File

@@ -128,8 +128,11 @@ public final class CellIdentityTdscdma extends CellIdentity {
this(cid.base.base.mcc, cid.base.base.mnc, cid.base.base.lac, cid.base.base.cid, this(cid.base.base.mcc, cid.base.base.mnc, cid.base.base.lac, cid.base.base.cid,
cid.base.base.cpid, cid.base.uarfcn, cid.base.operatorNames.alphaLong, cid.base.base.cpid, cid.base.uarfcn, cid.base.operatorNames.alphaLong,
cid.base.operatorNames.alphaShort, cid.base.operatorNames.alphaShort,
cid.additionalPlmns, cid.optionalCsgInfo.csgInfo() != null cid.additionalPlmns,
? new ClosedSubscriberGroupInfo(cid.optionalCsgInfo.csgInfo()) : null); cid.optionalCsgInfo.getDiscriminator()
== android.hardware.radio.V1_5.OptionalCsgInfo.hidl_discriminator.csgInfo
? new ClosedSubscriberGroupInfo(cid.optionalCsgInfo.csgInfo())
: null);
} }
/** @hide */ /** @hide */

6
telephony/java/android/telephony/CellIdentityWcdma.java
View File

@@ -123,8 +123,10 @@ public final class CellIdentityWcdma extends CellIdentity {
this(cid.base.base.lac, cid.base.base.cid, cid.base.base.psc, cid.base.base.uarfcn, this(cid.base.base.lac, cid.base.base.cid, cid.base.base.psc, cid.base.base.uarfcn,
cid.base.base.mcc, cid.base.base.mnc, cid.base.operatorNames.alphaLong, cid.base.base.mcc, cid.base.base.mnc, cid.base.operatorNames.alphaLong,
cid.base.operatorNames.alphaShort, cid.additionalPlmns, cid.base.operatorNames.alphaShort, cid.additionalPlmns,
cid.optionalCsgInfo.csgInfo() != null cid.optionalCsgInfo.getDiscriminator()
? new ClosedSubscriberGroupInfo(cid.optionalCsgInfo.csgInfo()) : null); == android.hardware.radio.V1_5.OptionalCsgInfo.hidl_discriminator.csgInfo
? new ClosedSubscriberGroupInfo(cid.optionalCsgInfo.csgInfo())
: null);
} }
private CellIdentityWcdma(@NonNull CellIdentityWcdma cid) { private CellIdentityWcdma(@NonNull CellIdentityWcdma cid) {