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

Commit f5885a52 authored by Sangyun Yun's avatar Sangyun Yun Committed by Android (Google) Code Review
Browse files

Merge "Hide pii in CellIdentity and CellLocation" into udc-dev

parents 543f5543 f745dc50

telephony/java/android/telephony/CellIdentityCdma.java

+5 −2
Original line number Diff line number Diff line
@@ -23,6 +23,9 @@ import android.annotation.Nullable; 
import android.os.Parcel;

import android.telephony.cdma.CdmaCellLocation;



import com.android.internal.telephony.util.TelephonyUtils;

import com.android.telephony.Rlog;



import java.util.Objects;



/**
@@ -242,8 +245,8 @@ public final class CellIdentityCdma extends CellIdentity { 
        .append(":{ mNetworkId=").append(mNetworkId)

        .append(" mSystemId=").append(mSystemId)

        .append(" mBasestationId=").append(mBasestationId)

        .append(" mLongitude=").append(mLongitude)

        .append(" mLatitude=").append(mLatitude)

        .append(" mLongitude=").append(Rlog.pii(TelephonyUtils.IS_DEBUGGABLE, mLongitude))

        .append(" mLatitude=").append(Rlog.pii(TelephonyUtils.IS_DEBUGGABLE, mLatitude))

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

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

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

telephony/java/android/telephony/cdma/CdmaCellLocation.java

+5 −2
Original line number Diff line number Diff line
@@ -21,6 +21,9 @@ import android.os.Build; 
import android.os.Bundle;

import android.telephony.CellLocation;



import com.android.internal.telephony.util.TelephonyUtils;

import com.android.telephony.Rlog;



/**

 * Represents the cell location on a CDMA phone.

 *
@@ -197,8 +200,8 @@ public class CdmaCellLocation extends CellLocation { 
    @Override

    public String toString() {

        return "[" + this.mBaseStationId + ","

                   + this.mBaseStationLatitude + ","

                   + this.mBaseStationLongitude + ","

                   + Rlog.pii(TelephonyUtils.IS_DEBUGGABLE, this.mBaseStationLatitude) + ","

                   + Rlog.pii(TelephonyUtils.IS_DEBUGGABLE, this.mBaseStationLongitude) + ","

                   + this.mSystemId + ","

                   + this.mNetworkId + "]";

    }