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

Merge "Add NR to CellInfo"

Browse Source 
am: 35cf55c4eb

Change-Id: I2753e3f851f1e3c3d2c617b5d930efc980ecaa7f
This commit is contained in:
Sarah Chin
2019-11-22 17:10:58 -08:00
committed by android-build-merger
parent 6add1afd83 35cf55c4eb
commit ad7bacce36
3 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -61,6 +61,12 @@ public final class CellIdentityNr extends CellIdentity {
mNci = inRangeOrUnavailable(nci, 0, MAX_NCI); mNci = inRangeOrUnavailable(nci, 0, MAX_NCI);
} }
/** @hide */
public CellIdentityNr(android.hardware.radio.V1_4.CellIdentityNr cid) {
this(cid.pci, cid.tac, cid.nrarfcn, cid.mcc, cid.mnc, cid.nci, cid.operatorNames.alphaLong,
cid.operatorNames.alphaShort);
}
/** @hide */ /** @hide */
public CellIdentityNr sanitizeLocationInfo() { public CellIdentityNr sanitizeLocationInfo() {
return new CellIdentityNr(CellInfo.UNAVAILABLE, CellInfo.UNAVAILABLE, CellInfo.UNAVAILABLE, return new CellIdentityNr(CellInfo.UNAVAILABLE, CellInfo.UNAVAILABLE, CellInfo.UNAVAILABLE,

1
telephony/java/android/telephony/CellInfo.java
View File

@@ -374,6 +374,7 @@ public abstract class CellInfo implements Parcelable {
case Info.hidl_discriminator.lte: return new CellInfoLte(ci, timeStamp); case Info.hidl_discriminator.lte: return new CellInfoLte(ci, timeStamp);
case Info.hidl_discriminator.wcdma: return new CellInfoWcdma(ci, timeStamp); case Info.hidl_discriminator.wcdma: return new CellInfoWcdma(ci, timeStamp);
case Info.hidl_discriminator.tdscdma: return new CellInfoTdscdma(ci, timeStamp); case Info.hidl_discriminator.tdscdma: return new CellInfoTdscdma(ci, timeStamp);
case Info.hidl_discriminator.nr: return new CellInfoNr(ci, timeStamp);
default: return null; default: return null;
} }
} }

8
telephony/java/android/telephony/CellInfoNr.java
View File

@@ -45,6 +45,14 @@ public final class CellInfoNr extends CellInfo {
mCellSignalStrength = other.mCellSignalStrength; mCellSignalStrength = other.mCellSignalStrength;
} }
/** @hide */
public CellInfoNr(android.hardware.radio.V1_4.CellInfo ci, long timeStamp) {
super(ci, timeStamp);
final android.hardware.radio.V1_4.CellInfoNr cil = ci.info.nr();
mCellIdentity = new CellIdentityNr(cil.cellidentity);
mCellSignalStrength = new CellSignalStrengthNr(cil.signalStrength);
}
/** /**
* @return a {@link CellIdentityNr} instance. * @return a {@link CellIdentityNr} instance.
*/ */