Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add ncid to CellLocation in CellIdentityNr" into rvc-qpr-dev am: c8eaff3037

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12469801

Change-Id: I2927aafb6d15fa21b01a03d2695dbcc95c4c50d7
This commit is contained in:
Sarah Chin
2020-09-22 00:31:33 +00:00
committed by Automerger Merge Worker
parent 736996e4ab c8eaff3037
commit 200a444461
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
telephony/java/android/telephony/CellIdentityNr.java
View File

@@ -138,7 +138,11 @@ public final class CellIdentityNr extends CellIdentity {
@NonNull @NonNull
@Override @Override
public CellLocation asCellLocation() { 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 @Override

2
telephony/java/android/telephony/gsm/GsmCellLocation.java
View File

@@ -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() { public int getCid() {
return mCid; return mCid;