commit dfcd2618ba83c512d0325e1d2c90c0a2114e6db3
author Sarah Chin <sarahchin@google.com> Thu Sep 24 22:42:43 2020 -0700
committer Sarah Chin <sarahchin@google.com> Thu Sep 24 22:48:48 2020 -0700
tree 5185cdb728ba26f0b0274141b955bc18aad30fb8
parent b1e6abcd0bb7c689a15927ecdb5b5c2b241ac89e

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

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

diff --git a/src/java/com/android/internal/telephony/ServiceStateTracker.java b/src/java/com/android/internal/telephony/ServiceStateTracker.java
index 2d1121d..922b934 100755
--- a/src/java/com/android/internal/telephony/ServiceStateTracker.java
+++ b/src/java/com/android/internal/telephony/ServiceStateTracker.java
@@ -2401,7 +2401,10 @@
             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;
     }