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

Commit fc154471 authored by Sarah Chin's avatar Sarah Chin Committed by Automerger Merge Worker
Browse files

Merge "Add ncid to CellLocation in CellIdentityNr" into rvc-qpr-dev am: c8eaff30 am: 200a4444 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12469801

Change-Id: Ib6505c6ad261ff8f38d98df90af5a74b8a003d51
parents 96ae4da1 200a4444

telephony/java/android/telephony/CellIdentityNr.java

+5 −1
Original line number Diff line number Diff line
@@ -138,7 +138,11 @@ public final class CellIdentityNr extends CellIdentity { 
    @NonNull

    @Override

    public CellLocation asCellLocation() {

        return new GsmCellLocation();

        GsmCellLocation cl = new GsmCellLocation();

        int tac = mTac != CellInfo.UNAVAILABLE ? mTac : -1;

        cl.setLacAndCid(tac, -1);

        cl.setPsc(0);

        return cl;

    }



    @Override

telephony/java/android/telephony/gsm/GsmCellLocation.java

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ public class GsmCellLocation extends CellLocation { 
    }



    /**

     * @return gsm cell id, -1 if unknown, 0xffff max legal value

     * @return gsm cell id, -1 if unknown or invalid, 0xffff max legal value

     */

    public int getCid() {

        return mCid;