Add default constructor to NR cell classes

The default constructor is missing in CellInfoNr and CellIdentityNr
classes. All the other CellInfo* and CellIdentity* classes have it.

Also, add setCellIdentity(CellIdentityNr) method to CellInfoNr.

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1202369
Bug: 147260058
Test: m
Merged-In: I4617272446ffb32d5d33d14d825f4ed919cc1c47
Change-Id: I4617272446ffb32d5d33d14d825f4ed919cc1c47
(cherry picked from commit 23382679eb)
This commit is contained in:
Tyler Gunn
2020-08-19 15:41:33 +00:00
parent 0642f54f64
commit ebceb0dd39
2 changed files with 25 additions and 1 deletions

View File

@@ -50,6 +50,18 @@ public final class CellIdentityNr extends CellIdentity {
// a list of additional PLMN-IDs reported for this cell
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].

View File

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