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

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

Merge "Fix invalid CID for NR CellInfo" am: d618ad8f 

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1440294

Change-Id: I7e35cc5bdb9fc4d9eb07396d074c5390c4f96ddc
parents cd21b3b4 d618ad8f

src/java/com/android/internal/telephony/ServiceStateTracker.java

+4 −1
Original line number Diff line number Diff line
@@ -2397,7 +2397,10 @@ public class ServiceStateTracker extends Handler { 
            default: break;

        }

        // If the CID is unreported

        if (cid == Integer.MAX_VALUE) cid = -1;

        if (cid == (id.getType() == CellInfo.TYPE_NR

                ? CellInfo.UNAVAILABLE_LONG : CellInfo.UNAVAILABLE)) {

            cid = -1;

        }



        return cid;

    }