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

Commit d43822bc authored by Nathan Harold's avatar Nathan Harold Committed by Android (Google) Code Review
Browse files

Merge changes from topic "cellid-pii" into main 

* changes:
  Pii cell identity
  Add getCellIdentity() to improve test-ability
parents 869e3361 91a721a7

telephony/java/android/telephony/BarringInfo.java

+11 −0
Original line number Diff line number Diff line
@@ -301,6 +301,17 @@ public final class BarringInfo implements Parcelable { 
                ? BARRING_SERVICE_INFO_UNBARRED : BARRING_SERVICE_INFO_UNKNOWN;

    }



    /**

     * Return the cell that reported the BarringInfo.

     *

     * @return the {@link CellIdentity} of the cell that is broadcasting this barring information.

     *

     * @hide

     */

    public CellIdentity getCellIdentity() {

        return mCellIdentity;

    }



    /** @hide */

    @SystemApi

    public @NonNull BarringInfo createLocationInfoSanitizedCopy() {

telephony/java/android/telephony/CellIdentityGsm.java

+4 −4
Original line number Diff line number Diff line
@@ -269,10 +269,10 @@ public final class CellIdentityGsm extends CellIdentity { 
    @Override

    public String toString() {

        return new StringBuilder(TAG)

        .append(":{ mLac=").append(mLac)

        .append(" mCid=").append(mCid)

        .append(" mArfcn=").append(mArfcn)

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

        .append(":{ mLac=").append(Rlog.pii(TAG, mLac))

        .append(" mCid=").append(Rlog.pii(TAG, mCid))

        .append(" mArfcn=").append(Rlog.pii(TAG, mArfcn))

        .append(" mBsic=").append("0x").append(Rlog.pii(TAG, Integer.toHexString(mBsic)))

        .append(" mMcc=").append(mMccStr)

        .append(" mMnc=").append(mMncStr)

        .append(" mAlphaLong=").append(mAlphaLong)

telephony/java/android/telephony/CellIdentityLte.java

+5 −5
Original line number Diff line number Diff line
@@ -339,10 +339,10 @@ public final class CellIdentityLte extends CellIdentity { 
    @Override

    public String toString() {

        return new StringBuilder(TAG)

        .append(":{ mCi=").append(mCi)

        .append(" mPci=").append(mPci)

        .append(" mTac=").append(mTac)

        .append(" mEarfcn=").append(mEarfcn)

        .append(":{ mCi=").append(Rlog.pii(TAG, mCi))

        .append(" mPci=").append(Rlog.pii(TAG, mPci))

        .append(" mTac=").append(Rlog.pii(TAG, mTac))

        .append(" mEarfcn=").append(Rlog.pii(TAG, mEarfcn))

        .append(" mBands=").append(Arrays.toString(mBands))

        .append(" mBandwidth=").append(mBandwidth)

        .append(" mMcc=").append(mMccStr)
@@ -350,7 +350,7 @@ public final class CellIdentityLte extends CellIdentity { 
        .append(" mAlphaLong=").append(mAlphaLong)

        .append(" mAlphaShort=").append(mAlphaShort)

        .append(" mAdditionalPlmns=").append(mAdditionalPlmns)

        .append(" mCsgInfo=").append(mCsgInfo)

        .append(" mCsgInfo=").append(Rlog.pii(TAG, mCsgInfo))

        .append("}").toString();

    }

telephony/java/android/telephony/CellIdentityNr.java

+4 −4
Original line number Diff line number Diff line
@@ -241,13 +241,13 @@ public final class CellIdentityNr extends CellIdentity { 
    @Override

    public String toString() {

        return new StringBuilder(TAG + ":{")

                .append(" mPci = ").append(mPci)

                .append(" mTac = ").append(mTac)

                .append(" mNrArfcn = ").append(mNrArfcn)

                .append(" mPci = ").append(Rlog.pii(TAG, mPci))

                .append(" mTac = ").append(Rlog.pii(TAG, mTac))

                .append(" mNrArfcn = ").append(Rlog.pii(TAG, mNrArfcn))

                .append(" mBands = ").append(Arrays.toString(mBands))

                .append(" mMcc = ").append(mMccStr)

                .append(" mMnc = ").append(mMncStr)

                .append(" mNci = ").append(mNci)

                .append(" mNci = ").append(Rlog.pii(TAG, mNci))

                .append(" mAlphaLong = ").append(mAlphaLong)

                .append(" mAlphaShort = ").append(mAlphaShort)

                .append(" mAdditionalPlmns = ").append(mAdditionalPlmns)

telephony/java/android/telephony/CellIdentityTdscdma.java

+5 −5
Original line number Diff line number Diff line
@@ -261,12 +261,12 @@ public final class CellIdentityTdscdma extends CellIdentity { 
        .append(" mMnc=").append(mMncStr)

        .append(" mAlphaLong=").append(mAlphaLong)

        .append(" mAlphaShort=").append(mAlphaShort)

        .append(" mLac=").append(mLac)

        .append(" mCid=").append(mCid)

        .append(" mCpid=").append(mCpid)

        .append(" mUarfcn=").append(mUarfcn)

        .append(" mLac=").append(Rlog.pii(TAG, mLac))

        .append(" mCid=").append(Rlog.pii(TAG, mCid))

        .append(" mCpid=").append(Rlog.pii(TAG, mCpid))

        .append(" mUarfcn=").append(Rlog.pii(TAG, mUarfcn))

        .append(" mAdditionalPlmns=").append(mAdditionalPlmns)

        .append(" mCsgInfo=").append(mCsgInfo)

        .append(" mCsgInfo=").append(Rlog.pii(TAG, mCsgInfo))

        .append("}").toString();

    }