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

Merge "Coerce 8-bit bsic to Integer if Invalid" into nyc-dev

Browse Source 
am: 08acd3ce28

* commit '08acd3ce28ff34f5a49d693b4c1144d967208e67':
  Coerce 8-bit bsic to Integer if Invalid

Change-Id: I0fed240d0cd84e76283fb663f826b420922d1dc1
This commit is contained in:
Nathan Harold
2016-05-06 03:31:35 +00:00
committed by android-build-merger
parent d18da6fa93 08acd3ce28
commit f7e4c04af3
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -216,7 +216,12 @@ public final class CellIdentityGsm implements Parcelable {
mLac = in.readInt();
mCid = in.readInt();
mArfcn = in.readInt();
mBsic = in.readInt();
int bsic = in.readInt();
// In RIL BSIC is a UINT8, so 0xFF is the 'INVALID' designator
// for inbound parcels
if (bsic == 0xFF) bsic = Integer.MAX_VALUE;
mBsic = bsic;
if (DBG) log("CellIdentityGsm(Parcel): " + toString());
}