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

Merge "Add NR Cell Identity to CellIdentityNr"

Browse Source
This commit is contained in:
Nathan Harold
2019-02-12 23:18:15 +00:00
committed by Gerrit Code Review
parent c3382935d9 e13c593c9f
commit be5b40b90f
2 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -42336,6 +42336,7 @@ package android.telephony {
method public int getChannelNumber(); method public int getChannelNumber();
method public String getMccString(); method public String getMccString();
method public String getMncString(); method public String getMncString();
method public long getNci();
method public int getPci(); method public int getPci();
method public int getTac(); method public int getTac();
method public void writeToParcel(android.os.Parcel, int); method public void writeToParcel(android.os.Parcel, int);

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

@@ -30,6 +30,7 @@ public final class CellIdentityNr extends CellIdentity {
private final int mNrArfcn; private final int mNrArfcn;
private final int mPci; private final int mPci;
private final int mTac; private final int mTac;
private final long mNci;
/** /**
* *
@@ -44,11 +45,12 @@ public final class CellIdentityNr extends CellIdentity {
* @hide * @hide
*/ */
public CellIdentityNr(int pci, int tac, int nrArfcn, String mccStr, String mncStr, public CellIdentityNr(int pci, int tac, int nrArfcn, String mccStr, String mncStr,
String alphal, String alphas) { long nci, String alphal, String alphas) {
super(TAG, CellInfo.TYPE_NR, mccStr, mncStr, alphal, alphas); super(TAG, CellInfo.TYPE_NR, mccStr, mncStr, alphal, alphas);
mPci = pci; mPci = pci;
mTac = tac; mTac = tac;
mNrArfcn = nrArfcn; mNrArfcn = nrArfcn;
mNci = nci;
} }
/** /**
@@ -62,7 +64,7 @@ public final class CellIdentityNr extends CellIdentity {
@Override @Override
public int hashCode() { public int hashCode() {
return Objects.hash(super.hashCode(), mPci, mTac, mNrArfcn); return Objects.hash(super.hashCode(), mPci, mTac, mNrArfcn, mNci);
} }
@Override @Override
@@ -72,7 +74,17 @@ public final class CellIdentityNr extends CellIdentity {
} }
CellIdentityNr o = (CellIdentityNr) other; CellIdentityNr o = (CellIdentityNr) other;
return super.equals(o) && mPci == o.mPci && mTac == o.mTac && mNrArfcn == o.mNrArfcn; return super.equals(o) && mPci == o.mPci && mTac == o.mTac && mNrArfcn == o.mNrArfcn
&& mNci == o.mNci;
}
/**
* Get the NR Cell Identity.
*
* @return The NR Cell Identity in range [0, 68719476735] or Long.MAX_VALUE if unknown.
*/
public long getNci() {
return mNci;
} }
/** /**
@@ -122,6 +134,7 @@ public final class CellIdentityNr extends CellIdentity {
.append(" mNrArfcn = ").append(mNrArfcn) .append(" mNrArfcn = ").append(mNrArfcn)
.append(" mMcc = ").append(mMccStr) .append(" mMcc = ").append(mMccStr)
.append(" mMnc = ").append(mMncStr) .append(" mMnc = ").append(mMncStr)
.append(" mNci = ").append(mNci)
.append(" mAlphaLong = ").append(mAlphaLong) .append(" mAlphaLong = ").append(mAlphaLong)
.append(" mAlphaShort = ").append(mAlphaShort) .append(" mAlphaShort = ").append(mAlphaShort)
.append(" }") .append(" }")
@@ -134,6 +147,7 @@ public final class CellIdentityNr extends CellIdentity {
dest.writeInt(mPci); dest.writeInt(mPci);
dest.writeInt(mTac); dest.writeInt(mTac);
dest.writeInt(mNrArfcn); dest.writeInt(mNrArfcn);
dest.writeLong(mNci);
} }
/** Construct from Parcel, type has already been processed */ /** Construct from Parcel, type has already been processed */
@@ -142,6 +156,7 @@ public final class CellIdentityNr extends CellIdentity {
mPci = in.readInt(); mPci = in.readInt();
mTac = in.readInt(); mTac = in.readInt();
mNrArfcn = in.readInt(); mNrArfcn = in.readInt();
mNci = in.readLong();
} }
/** Implement the Parcelable interface */ /** Implement the Parcelable interface */