Merge "Coerce 8-bit bsic to Integer if Invalid" into nyc-dev am: 08acd3ce28

am: f7e4c04af3

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

Change-Id: Iabcec0a020b195af49109f9693034c4982e8127a
This commit is contained in:
Nathan Harold
2016-05-06 03:36:40 +00:00
committed by android-build-merger

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());
}