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

Merge "Fix BSIC Check in CellIdentityGsm"

Browse Source
This commit is contained in:
Nathan Harold
2018-12-27 01:44:14 +00:00
committed by Gerrit Code Review
parent bd9da6de04 b635fb8eb3
commit 7d615aae59
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
telephony/java/android/telephony/CellIdentityGsm.java
View File

@@ -77,13 +77,14 @@ public final class CellIdentityGsm extends CellIdentity {
/** @hide */ /** @hide */
public CellIdentityGsm(android.hardware.radio.V1_0.CellIdentityGsm cid) { public CellIdentityGsm(android.hardware.radio.V1_0.CellIdentityGsm cid) {
this(cid.lac, cid.cid, cid.arfcn, this(cid.lac, cid.cid, cid.arfcn,
cid.bsic == 0xFF ? CellInfo.UNAVAILABLE : cid.bsic, cid.mcc, cid.mnc, "", ""); cid.bsic == (byte) 0xFF ? CellInfo.UNAVAILABLE : cid.bsic,
cid.mcc, cid.mnc, "", "");
} }
/** @hide */ /** @hide */
public CellIdentityGsm(android.hardware.radio.V1_2.CellIdentityGsm cid) { public CellIdentityGsm(android.hardware.radio.V1_2.CellIdentityGsm cid) {
this(cid.base.lac, cid.base.cid, cid.base.arfcn, this(cid.base.lac, cid.base.cid, cid.base.arfcn,
cid.base.bsic == 0xFF ? CellInfo.UNAVAILABLE : cid.base.bsic, cid.base.mcc, cid.base.bsic == (byte) 0xFF ? CellInfo.UNAVAILABLE : cid.base.bsic, cid.base.mcc,
cid.base.mnc, cid.operatorNames.alphaLong, cid.operatorNames.alphaShort); cid.base.mnc, cid.operatorNames.alphaLong, cid.operatorNames.alphaShort);
} }