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 am: 200a444461

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

Change-Id: Ib6505c6ad261ff8f38d98df90af5a74b8a003d51
This commit is contained in:
Sarah Chin
2020-09-22 00:32:55 +00:00
committed by Automerger Merge Worker
parent 96ae4da1bd 200a444461
commit fc154471f6
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
@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

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() {
return mCid;