Fix invalid CID for NR CellInfo

ag/12470408 added the case for NR but did not update the invalid CID

Test: atest ServiceStateTrackerTest
Bug: 166513790
Change-Id: Id14e909dbce557e154af8eead546d85720428662
Merged-In: Id14e909dbce557e154af8eead546d85720428662

parent 8e2faa2b

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