Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e0ff0fc8 authored by Nathan Harold's avatar Nathan Harold Committed by android-build-merger
Browse files

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

Merge "Merge "Coerce 8-bit bsic to Integer if Invalid" into nyc-dev am: 08acd3ce am: f7e4c04a" into nyc-mr1-dev-plus-aosp
am: 579aea9f

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

Change-Id: Ia1c82cdb9ea0b447fc563dec85c333a486ced810
parents a1f79d34 579aea9f

telephony/java/android/telephony/CellIdentityGsm.java

+6 −1
Original line number Diff line number Diff line
@@ -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());

    }