Commit 8c30046f authored Sep 25, 2020 by TreeHugger Robot Committed by Automerger Merge Worker Sep 25, 2020

Merge "Fix invalid CID for NR CellInfo" into rvc-qpr-dev am: 3ac748f9 am: eaea0744

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

Change-Id: Iaa990555000f15562bd0e227c1c66badd91a2c8b

parents 38b89fb9 eaea0744

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

+4 −1

Original line number	Diff line number	Diff line
		@@ -2412,7 +2412,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;
		}