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

Commit 0491c462 authored by Sanket Padawe's avatar Sanket Padawe
Browse files

[DO NOT MERGE] Cellinfo: Update to version 12 

Add support for:
GSM: arfcn, bsic, ta
WCDMA: uarfcn
LTE: earfcn
Updated public APIs for getting above fields.

Bug: 23528586
Change-Id: I1e741ec73f2f683a796d430898b62921fe6e75e9
parent b84954cf

api/current.txt

+4 −0
Original line number Diff line number Diff line
@@ -30675,6 +30675,8 @@ package android.telephony { 














  public final class CellIdentityGsm implements android.os.Parcelable {















    method public int describeContents();













    method public int getArfcn();













    method public int getBsic();















    method public int getCid();















    method public int getLac();















    method public int getMcc();









@@ -30687,6 +30689,7 @@ package android.telephony {













  public final class CellIdentityLte implements android.os.Parcelable {















    method public int describeContents();















    method public int getCi();













    method public int getEarfcn();















    method public int getMcc();















    method public int getMnc();















    method public int getPci();









@@ -30702,6 +30705,7 @@ package android.telephony {













    method public int getMcc();















    method public int getMnc();















    method public int getPsc();













    method public int getUarfcn();















    method public void writeToParcel(android.os.Parcel, int);















    field public static final android.os.Parcelable.Creator<android.telephony.CellIdentityWcdma> CREATOR;















  }

























api/system-current.txt



+4
−0




























Original line number
Diff line number
Diff line








@@ -32922,6 +32922,8 @@ package android.telephony {



























  public final class CellIdentityGsm implements android.os.Parcelable {















    method public int describeContents();













    method public int getArfcn();













    method public int getBsic();















    method public int getCid();















    method public int getLac();















    method public int getMcc();









@@ -32934,6 +32936,7 @@ package android.telephony {













  public final class CellIdentityLte implements android.os.Parcelable {















    method public int describeContents();















    method public int getCi();













    method public int getEarfcn();















    method public int getMcc();















    method public int getMnc();















    method public int getPci();









@@ -32949,6 +32952,7 @@ package android.telephony {













    method public int getMcc();















    method public int getMnc();















    method public int getPsc();













    method public int getUarfcn();















    method public void writeToParcel(android.os.Parcel, int);















    field public static final android.os.Parcelable.Creator<android.telephony.CellIdentityWcdma> CREATOR;















  }

























telephony/java/android/telephony/CellIdentityGsm.java



+49
−1




























Original line number
Diff line number
Diff line








@@ -38,6 +38,10 @@ public final class CellIdentityGsm implements Parcelable {













    private final int mLac;















    // 16-bit GSM Cell Identity described in TS 27.007, 0..65535















    private final int mCid;













    // 16-bit GSM Absolute RF Channel Number













    private final int mArfcn;













    // 6-bit Base Station Identity Code













    private final int mBsic;































    /**















     * @hide









@@ -47,6 +51,8 @@ public final class CellIdentityGsm implements Parcelable {













        mMnc = Integer.MAX_VALUE;















        mLac = Integer.MAX_VALUE;















        mCid = Integer.MAX_VALUE;













        mArfcn = Integer.MAX_VALUE;













        mBsic = Integer.MAX_VALUE;















    }















    /**















     * public constructor









@@ -58,10 +64,27 @@ public final class CellIdentityGsm implements Parcelable {













     * @hide















     */















    public CellIdentityGsm (int mcc, int mnc, int lac, int cid) {













        this(mcc, mnc, lac, cid, Integer.MAX_VALUE, Integer.MAX_VALUE);













    }



























    /**













     * public constructor













     * @param mcc 3-digit Mobile Country Code, 0..999













     * @param mnc 2 or 3-digit Mobile Network Code, 0..999













     * @param lac 16-bit Location Area Code, 0..65535













     * @param cid 16-bit GSM Cell Identity or 28-bit UMTS Cell Identity













     * @param arfcn 16-bit GSM Absolute RF Channel Number













     * @param bsic 6-bit Base Station Identity Code













     *













     * @hide













     */













    public CellIdentityGsm (int mcc, int mnc, int lac, int cid, int arfcn, int bsic) {















        mMcc = mcc;















        mMnc = mnc;















        mLac = lac;















        mCid = cid;













        mArfcn = arfcn;













        mBsic = bsic;















    }































    private CellIdentityGsm(CellIdentityGsm cid) {









@@ -69,6 +92,8 @@ public final class CellIdentityGsm implements Parcelable {













        mMnc = cid.mMnc;















        mLac = cid.mLac;















        mCid = cid.mCid;













        mArfcn = cid.mArfcn;













        mBsic = cid.mBsic;















    }































    CellIdentityGsm copy() {










@@ -105,6 +130,21 @@ public final class CellIdentityGsm implements Parcelable {













        return mCid;















    }





























    /**













     * @return 16-bit GSM Absolute RF Channel Number, Integer.MAX_VALUE if unknown













     */













    public int getArfcn() {













        return mArfcn;













    }



























    /**













     * @return 6-bit Base Station Identity Code, Integer.MAX_VALUE if unknown













     */













    public int getBsic() {













        return mBsic;













    }











































    /**















     * @return Integer.MAX_VALUE, undefined for GSM















     */










@@ -132,7 +172,9 @@ public final class CellIdentityGsm implements Parcelable {













        return mMcc == o.mMcc &&















                mMnc == o.mMnc &&















                mLac == o.mLac &&













                mCid == o.mCid;













                mCid == o.mCid &&













                mArfcn == o.mArfcn &&













                mBsic == o.mBsic;















    }































    @Override









@@ -142,6 +184,8 @@ public final class CellIdentityGsm implements Parcelable {













        sb.append(" mMnc=").append(mMnc);















        sb.append(" mLac=").append(mLac);















        sb.append(" mCid=").append(mCid);













        sb.append(" mArfcn=").append(mArfcn);













        sb.append(" mBsic=").append("0x").append(Integer.toHexString(mBsic));















        sb.append("}");































        return sb.toString();









@@ -161,6 +205,8 @@ public final class CellIdentityGsm implements Parcelable {













        dest.writeInt(mMnc);















        dest.writeInt(mLac);















        dest.writeInt(mCid);













        dest.writeInt(mArfcn);













        dest.writeInt(mBsic);















    }































    /** Construct from Parcel, type has already been processed */









@@ -169,6 +215,8 @@ public final class CellIdentityGsm implements Parcelable {













        mMnc = in.readInt();















        mLac = in.readInt();















        mCid = in.readInt();













        mArfcn = in.readInt();













        mBsic = in.readInt();















        if (DBG) log("CellIdentityGsm(Parcel): " + toString());















    }

















































telephony/java/android/telephony/CellIdentityLte.java



+32
−1




























Original line number
Diff line number
Diff line








@@ -40,6 +40,8 @@ public final class CellIdentityLte implements Parcelable {













    private final int mPci;















    // 16-bit tracking area code















    private final int mTac;













    // 18-bit Absolute RF Channel Number













    private final int mEarfcn;































    /**















     * @hide









@@ -50,6 +52,7 @@ public final class CellIdentityLte implements Parcelable {













        mCi = Integer.MAX_VALUE;















        mPci = Integer.MAX_VALUE;















        mTac = Integer.MAX_VALUE;













        mEarfcn = Integer.MAX_VALUE;















    }































    /**









@@ -63,11 +66,27 @@ public final class CellIdentityLte implements Parcelable {













     * @hide















     */















    public CellIdentityLte (int mcc, int mnc, int ci, int pci, int tac) {













        this(mcc, mnc, ci, pci, tac, Integer.MAX_VALUE);













    }



























    /**













     *













     * @param mcc 3-digit Mobile Country Code, 0..999













     * @param mnc 2 or 3-digit Mobile Network Code, 0..999













     * @param ci 28-bit Cell Identity













     * @param pci Physical Cell Id 0..503













     * @param tac 16-bit Tracking Area Code













     * @param earfcn 18-bit LTE Absolute RF Channel Number













     *













     * @hide













     */













    public CellIdentityLte (int mcc, int mnc, int ci, int pci, int tac, int earfcn) {















        mMcc = mcc;















        mMnc = mnc;















        mCi = ci;















        mPci = pci;















        mTac = tac;













        mEarfcn = earfcn;















    }































    private CellIdentityLte(CellIdentityLte cid) {









@@ -76,6 +95,7 @@ public final class CellIdentityLte implements Parcelable {













        mCi = cid.mCi;















        mPci = cid.mPci;















        mTac = cid.mTac;













        mEarfcn = cid.mEarfcn;















    }































    CellIdentityLte copy() {










@@ -117,6 +137,13 @@ public final class CellIdentityLte implements Parcelable {













        return mTac;















    }





























    /**













     * @return 18-bit Absolute RF Channel Number, Integer.MAX_VALUE if unknown













     */













    public int getEarfcn() {













        return mEarfcn;













    }





























    @Override















    public int hashCode() {















        return Objects.hash(mMcc, mMnc, mCi, mPci, mTac);









@@ -137,7 +164,8 @@ public final class CellIdentityLte implements Parcelable {













                mMnc == o.mMnc &&















                mCi == o.mCi &&















                mPci == o.mPci &&













                mTac == o.mTac;













                mTac == o.mTac &&













                mEarfcn == o.mEarfcn;















    }































    @Override









@@ -148,6 +176,7 @@ public final class CellIdentityLte implements Parcelable {













        sb.append(" mCi="); sb.append(mCi);















        sb.append(" mPci="); sb.append(mPci);















        sb.append(" mTac="); sb.append(mTac);













        sb.append(" mEarfcn="); sb.append(mEarfcn);















        sb.append("}");































        return sb.toString();









@@ -168,6 +197,7 @@ public final class CellIdentityLte implements Parcelable {













        dest.writeInt(mCi);















        dest.writeInt(mPci);















        dest.writeInt(mTac);













        dest.writeInt(mEarfcn);















    }































    /** Construct from Parcel, type has already been processed */









@@ -177,6 +207,7 @@ public final class CellIdentityLte implements Parcelable {













        mCi = in.readInt();















        mPci = in.readInt();















        mTac = in.readInt();













        mEarfcn = in.readInt();















        if (DBG) log("CellIdentityLte(Parcel): " + toString());















    }

















































telephony/java/android/telephony/CellIdentityWcdma.java



+32
−1




























Original line number
Diff line number
Diff line








@@ -40,6 +40,8 @@ public final class CellIdentityWcdma implements Parcelable {













    private final int mCid;















    // 9-bit UMTS Primary Scrambling Code described in TS 25.331, 0..511















    private final int mPsc;













    // 16-bit UMTS Absolute RF Channel Number













    private final int mUarfcn;































    /**















     * @hide









@@ -50,6 +52,7 @@ public final class CellIdentityWcdma implements Parcelable {













        mLac = Integer.MAX_VALUE;















        mCid = Integer.MAX_VALUE;















        mPsc = Integer.MAX_VALUE;













        mUarfcn = Integer.MAX_VALUE;















    }















    /**















     * public constructor









@@ -62,11 +65,27 @@ public final class CellIdentityWcdma implements Parcelable {













     * @hide















     */















    public CellIdentityWcdma (int mcc, int mnc, int lac, int cid, int psc) {













        this(mcc, mnc, lac, cid, psc, Integer.MAX_VALUE);













    }



























    /**













     * public constructor













     * @param mcc 3-digit Mobile Country Code, 0..999













     * @param mnc 2 or 3-digit Mobile Network Code, 0..999













     * @param lac 16-bit Location Area Code, 0..65535













     * @param cid 28-bit UMTS Cell Identity













     * @param psc 9-bit UMTS Primary Scrambling Code













     * @param uarfcn 16-bit UMTS Absolute RF Channel Number













     *













     * @hide













     */













    public CellIdentityWcdma (int mcc, int mnc, int lac, int cid, int psc, int uarfcn) {















        mMcc = mcc;















        mMnc = mnc;















        mLac = lac;















        mCid = cid;















        mPsc = psc;













        mUarfcn = uarfcn;















    }































    private CellIdentityWcdma(CellIdentityWcdma cid) {









@@ -75,6 +94,7 @@ public final class CellIdentityWcdma implements Parcelable {













        mLac = cid.mLac;















        mCid = cid.mCid;















        mPsc = cid.mPsc;













        mUarfcn = cid.mUarfcn;















    }































    CellIdentityWcdma copy() {










@@ -123,6 +143,13 @@ public final class CellIdentityWcdma implements Parcelable {













        return Objects.hash(mMcc, mMnc, mLac, mCid, mPsc);















    }





























    /**













     * @return 16-bit UMTS Absolute RF Channel Number, Integer.MAX_VALUE if unknown













     */













    public int getUarfcn() {













        return mUarfcn;













    }





























    @Override















    public boolean equals(Object other) {















        if (this == other) {









@@ -138,7 +165,8 @@ public final class CellIdentityWcdma implements Parcelable {













                mMnc == o.mMnc &&















                mLac == o.mLac &&















                mCid == o.mCid &&













                mPsc == o.mPsc;













                mPsc == o.mPsc &&













                mUarfcn == o.mUarfcn;















    }































    @Override









@@ -149,6 +177,7 @@ public final class CellIdentityWcdma implements Parcelable {













        sb.append(" mLac=").append(mLac);















        sb.append(" mCid=").append(mCid);















        sb.append(" mPsc=").append(mPsc);













        sb.append(" mUarfcn=").append(mUarfcn);















        sb.append("}");































        return sb.toString();









@@ -169,6 +198,7 @@ public final class CellIdentityWcdma implements Parcelable {













        dest.writeInt(mLac);















        dest.writeInt(mCid);















        dest.writeInt(mPsc);













        dest.writeInt(mUarfcn);















    }































    /** Construct from Parcel, type has already been processed */









@@ -178,6 +208,7 @@ public final class CellIdentityWcdma implements Parcelable {













        mLac = in.readInt();















        mCid = in.readInt();















        mPsc = in.readInt();













        mUarfcn = in.readInt();















        if (DBG) log("CellIdentityWcdma(Parcel): " + toString());















    }