diff options
| author | Sarah Chin <sarahchin@google.com> | 2020-09-22 00:31:33 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-22 00:31:33 +0000 |
| commit | 200a4444610ee08d0de2a60b5158e30563e407d1 (patch) | |
| tree | f726cfa4f4e6945ae5486fbd8f330c1ffb8b8a00 | |
| parent | 736996e4abef46559229aa1ad6953dc23afeacc3 (diff) | |
| parent | c8eaff30373b5c9503d23d12bef11a83c3cc4464 (diff) | |
Merge "Add ncid to CellLocation in CellIdentityNr" into rvc-qpr-dev am: c8eaff3037
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12469801
Change-Id: I2927aafb6d15fa21b01a03d2695dbcc95c4c50d7
| -rw-r--r-- | telephony/java/android/telephony/CellIdentityNr.java | 6 | ||||
| -rw-r--r-- | telephony/java/android/telephony/gsm/GsmCellLocation.java | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/telephony/java/android/telephony/CellIdentityNr.java b/telephony/java/android/telephony/CellIdentityNr.java index a8206e69efd2..45a67b39ea55 100644 --- a/telephony/java/android/telephony/CellIdentityNr.java +++ b/telephony/java/android/telephony/CellIdentityNr.java @@ -138,7 +138,11 @@ public final class CellIdentityNr extends CellIdentity { @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 diff --git a/telephony/java/android/telephony/gsm/GsmCellLocation.java b/telephony/java/android/telephony/gsm/GsmCellLocation.java index 30cea0e6dd59..bc8ee1dd9359 100644 --- a/telephony/java/android/telephony/gsm/GsmCellLocation.java +++ b/telephony/java/android/telephony/gsm/GsmCellLocation.java @@ -55,7 +55,7 @@ public class GsmCellLocation extends CellLocation { } /** - * @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; |