Merge "Add default constructor to NR cell classes" into rvc-qpr-dev (932f4fb2) · Commits · e / os / android_frameworks_base

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].

+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.
		*/