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

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

Merge "Fix BSIC Check in CellIdentityGsm" am: 7d615aae 

am: d34107b2

Change-Id: I565c33a88a34950bb788a1c0af6f270342d8c79b
parents 47872bf7 d34107b2

telephony/java/android/telephony/CellIdentityGsm.java

+3 −2
Original line number Original line Diff line number Diff line
@@ -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);

    }

    }