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

Commit cdb73a27 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge changes from topic "am-002ad919bad249f3b11d8215de81b6c6" 

* changes:
  [automerger skipped] Merge changes from topics "nw-scan-cts", "nw-scan-changes" am: f276a562 am: 7e3864bc am: e53008be -s ours am skip reason: change_id I1f75c9005620b3b0e06f066677cba6190f1d266c with SHA1 9cf3e7ae is in history
  Allow requestNetworkScan to return sanitized info am: c9d74306 am: 87217889 am: 9e1d425b
parents 786f82c2 69e03149

telephony/java/android/telephony/CellIdentity.java

+16 −0
Original line number Diff line number Diff line
@@ -109,6 +109,22 @@ public abstract class CellIdentity implements Parcelable { 
        return mType;

    }



    /**

     * @return MCC or null for CDMA

     * @hide

     */

    public String getMccString() {

        return mMccStr;

    }



    /**

     * @return MNC or null for CDMA

     * @hide

     */

    public String getMncString() {

        return mMncStr;

    }



    /**

     * Returns the channel number of the cell identity.

     *

telephony/java/android/telephony/CellIdentityCdma.java

+7 −0
Original line number Diff line number Diff line
@@ -109,6 +109,13 @@ public final class CellIdentityCdma extends CellIdentity { 
        return new CellIdentityCdma(this);

    }



    /** @hide */

    public CellIdentityCdma sanitizeLocationInfo() {

        return new CellIdentityCdma(CellInfo.UNAVAILABLE, CellInfo.UNAVAILABLE,

                CellInfo.UNAVAILABLE, CellInfo.UNAVAILABLE, CellInfo.UNAVAILABLE,

                mAlphaLong, mAlphaShort);

    }



    /**

     * Take the latitude and longitude in 1/4 seconds and see if

     * the reported location is on Null Island.

telephony/java/android/telephony/CellIdentityGsm.java

+6 −0
Original line number Diff line number Diff line
@@ -97,6 +97,12 @@ public final class CellIdentityGsm extends CellIdentity { 
        return new CellIdentityGsm(this);

    }



    /** @hide */

    public CellIdentityGsm sanitizeLocationInfo() {

        return new CellIdentityGsm(CellInfo.UNAVAILABLE, CellInfo.UNAVAILABLE, CellInfo.UNAVAILABLE,

                CellInfo.UNAVAILABLE, mMccStr, mMncStr, mAlphaLong, mAlphaShort);

    }



    /**

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

     *         {@link android.telephony.CellInfo#UNAVAILABLE UNAVAILABLE} if unavailable.

telephony/java/android/telephony/CellIdentityLte.java

+7 −0
Original line number Diff line number Diff line
@@ -113,6 +113,13 @@ public final class CellIdentityLte extends CellIdentity { 
                cid.mMncStr, cid.mAlphaLong, cid.mAlphaShort);

    }



    /** @hide */

    public CellIdentityLte sanitizeLocationInfo() {

        return new CellIdentityLte(CellInfo.UNAVAILABLE, CellInfo.UNAVAILABLE, CellInfo.UNAVAILABLE,

                CellInfo.UNAVAILABLE, CellInfo.UNAVAILABLE,

                mMccStr, mMncStr, mAlphaLong, mAlphaShort);

    }



    CellIdentityLte copy() {

        return new CellIdentityLte(this);

    }

telephony/java/android/telephony/CellIdentityNr.java

+7 −1
Original line number Diff line number Diff line
@@ -55,6 +55,12 @@ public final class CellIdentityNr extends CellIdentity { 
        mNci = nci;

    }



    /** @hide */

    public CellIdentityNr sanitizeLocationInfo() {

        return new CellIdentityNr(CellInfo.UNAVAILABLE, CellInfo.UNAVAILABLE, CellInfo.UNAVAILABLE,

                mMccStr, mMncStr, CellInfo.UNAVAILABLE, mAlphaLong, mAlphaShort);

    }



    /**

     * @return a CellLocation object for this CellIdentity.

     * @hide