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

Commit 91a721a7 authored by Nathan Harold's avatar Nathan Harold
Browse files

Pii cell identity 

Fix: 361387150
Test: basic voice call + data browsing
Flag: EXEMPT bugfix
Change-Id: I668e14de1724abc70b775cceeaabd03d477e769b
parent 1e2edb06

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();

    }

telephony/java/android/telephony/CellIdentityWcdma.java

+5 −5
Original line number Diff line number Diff line
@@ -279,16 +279,16 @@ public final class CellIdentityWcdma extends CellIdentity { 
    @Override

    public String toString() {

        return new StringBuilder(TAG)

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

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

        .append(" mPsc=").append(mPsc)

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

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

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

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

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

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

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

        .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();

    }