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

Merge "Add default constructor to NR cell classes" am: f12f3415d0 am: 503b23ed03 am: 8ef5d0eb2c am: 827314c594

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

Change-Id: I4617272446ffb32d5d33d14d825f4ed919cc1c47
This commit is contained in:
Tyler Gunn
2020-08-19 15:41:33 +00:00
committed by Automerger Merge Worker
parent e6444ce70b 827314c594
commit 23382679eb
2 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -50,6 +50,18 @@ public final class CellIdentityNr extends CellIdentity {
// a list of additional PLMN-IDs reported for this cell // a list of additional PLMN-IDs reported for this cell
private final ArraySet<String> mAdditionalPlmns; private final ArraySet<String> mAdditionalPlmns;
/** @hide */
public CellIdentityNr() {
super(TAG, CellInfo.TYPE_NR, null, null, null, null);
mNrArfcn = CellInfo.UNAVAILABLE;
mPci = CellInfo.UNAVAILABLE;
mTac = CellInfo.UNAVAILABLE;
mNci = CellInfo.UNAVAILABLE;
mBands = new int[] {};
mAdditionalPlmns = new ArraySet();
mGlobalCellId = null;
}
/** /**
* *
* @param pci Physical Cell Id in range [0, 1007]. * @param pci Physical Cell Id in range [0, 1007].

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

@@ -29,9 +29,16 @@ import java.util.Objects;
public final class CellInfoNr extends CellInfo { public final class CellInfoNr extends CellInfo {
private static final String TAG = "CellInfoNr"; private static final String TAG = "CellInfoNr";
private final CellIdentityNr mCellIdentity; private CellIdentityNr mCellIdentity;
private final CellSignalStrengthNr mCellSignalStrength; private final CellSignalStrengthNr mCellSignalStrength;
/** @hide */
public CellInfoNr() {
super();
mCellIdentity = new CellIdentityNr();
mCellSignalStrength = new CellSignalStrengthNr();
}
private CellInfoNr(Parcel in) { private CellInfoNr(Parcel in) {
super(in); super(in);
mCellIdentity = CellIdentityNr.CREATOR.createFromParcel(in); mCellIdentity = CellIdentityNr.CREATOR.createFromParcel(in);
@@ -71,6 +78,11 @@ public final class CellInfoNr extends CellInfo {
return mCellIdentity; return mCellIdentity;
} }
/** @hide */
public void setCellIdentity(CellIdentityNr cid) {
mCellIdentity = cid;
}
/** /**
* @return a {@link CellSignalStrengthNr} instance. * @return a {@link CellSignalStrengthNr} instance.
*/ */