Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ebceb0dd authored by Tyler Gunn's avatar Tyler Gunn
Browse files

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 23382679)
parent 0642f54f

telephony/java/android/telephony/CellIdentityNr.java

+12 −0
Original line number Diff line number Diff line
@@ -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].

telephony/java/android/telephony/CellInfoNr.java

+13 −1
Original line number Diff line number Diff line
@@ -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.

     */