commit 69e53926f2c56263e815965242fc0625245e09e2
author Sarah Chin <sarahchin@google.com> Thu Aug 27 11:11:34 2020 -0700
committer Sarah Chin <sarahchin@google.com> Mon Sep 21 20:22:08 2020 +0000
tree 88f732d657281a42d0ec14afe4eb74423bf47ff4
parent 6e43615af3aa0a37e50d0c928d868b2403a2ac30

Add ncid to CellLocation in CellIdentityNr

Update GsmCellLocation documentation for NR case. Since the NR cell ID
is 36 bits and can't fit into the 32-bit field in GsmCellLocation,
return -1 for the CID.

Test: atest CellIdentityNrTest
Bug: 166514842
Change-Id: Ib894e83900b590c11221502ad039781cea5b571c

telephony/java/android/telephony/CellIdentityNr.java

diff --git a/telephony/java/android/telephony/CellIdentityNr.java b/telephony/java/android/telephony/CellIdentityNr.java
index 1794ac5..26c8d79 100644
--- a/telephony/java/android/telephony/CellIdentityNr.java
+++ b/telephony/java/android/telephony/CellIdentityNr.java
@@ -126,7 +126,11 @@
     @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

diff --git a/telephony/java/android/telephony/gsm/GsmCellLocation.java b/telephony/java/android/telephony/gsm/GsmCellLocation.java
index 30cea0e..bc8ee1d 100644
--- a/telephony/java/android/telephony/gsm/GsmCellLocation.java
+++ b/telephony/java/android/telephony/gsm/GsmCellLocation.java
@@ -55,7 +55,7 @@
     }
 
     /**
-     * @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;