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

Merge "Update NR TAC limit to 3 bytes" am: 77f906a3f5 am: 45e51ed217 am: 5767488929

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

Change-Id: Icf3552d07fcf03b6495dd709c94e59ec35309675
This commit is contained in:
Sarah Chin
2020-09-29 01:46:43 +00:00
committed by Automerger Merge Worker
parent db33922c54 5767488929
commit 920229367d
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -46945,7 +46945,7 @@ package android.telephony {
method public long getNci();
method @IntRange(from=0, to=3279165) public int getNrarfcn();
method @IntRange(from=0, to=1007) public int getPci();
method @IntRange(from=0, to=65535) public int getTac();
method @IntRange(from=0, to=16777215) public int getTac();
method public void writeToParcel(android.os.Parcel, int);
field @NonNull public static final android.os.Parcelable.Creator<android.telephony.CellIdentityNr> CREATOR;
}

2
non-updatable-api/current.txt
View File

@@ -45113,7 +45113,7 @@ package android.telephony {
method public long getNci();
method @IntRange(from=0, to=3279165) public int getNrarfcn();
method @IntRange(from=0, to=1007) public int getPci();
method @IntRange(from=0, to=65535) public int getTac();
method @IntRange(from=0, to=16777215) public int getTac();
method public void writeToParcel(android.os.Parcel, int);
field @NonNull public static final android.os.Parcelable.Creator<android.telephony.CellIdentityNr> CREATOR;
}

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

@@ -37,7 +37,7 @@ public final class CellIdentityNr extends CellIdentity {
private static final String TAG = "CellIdentityNr";
private static final int MAX_PCI = 1007;
private static final int MAX_TAC = 65535;
private static final int MAX_TAC = 16777215; // 0xffffff
private static final int MAX_NRARFCN = 3279165;
private static final long MAX_NCI = 68719476735L;
@@ -65,7 +65,7 @@ public final class CellIdentityNr extends CellIdentity {
/**
*
* @param pci Physical Cell Id in range [0, 1007].
* @param tac 16-bit Tracking Area Code.
* @param tac 24-bit Tracking Area Code.
* @param nrArfcn NR Absolute Radio Frequency Channel Number, in range [0, 3279165].
* @param bands Bands used by the cell. Band number defined in 3GPP TS 38.101-1 and TS 38.101-2.
* @param mccStr 3-digit Mobile Country Code in string format.
@@ -215,9 +215,9 @@ public final class CellIdentityNr extends CellIdentity {
/**
* Get the tracking area code.
* @return a 16 bit integer or {@link CellInfo#UNAVAILABLE} if unknown.
* @return a 24 bit integer or {@link CellInfo#UNAVAILABLE} if unknown.
*/
@IntRange(from = 0, to = 65535)
@IntRange(from = 0, to = 16777215)
public int getTac() {
return mTac;
}