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

Commit 92022936 authored by Sarah Chin's avatar Sarah Chin Committed by Automerger Merge Worker
Browse files

Merge "Update NR TAC limit to 3 bytes" am: 77f906a3 am: 45e51ed2 am: 57674889 

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

Change-Id: Icf3552d07fcf03b6495dd709c94e59ec35309675
parents db33922c 57674889

api/current.txt

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

  }

non-updatable-api/current.txt

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

  }

telephony/java/android/telephony/CellIdentityNr.java

+4 −4
Original line number Diff line number Diff line
@@ -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;

    }