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

Commit d80b956e authored by Sungcheol Ahn's avatar Sungcheol Ahn Committed by Android (Google) Code Review
Browse files

Merge "[telephony] Remove the PII for user build" into main

parents 0973fc60 70741af6

telephony/java/android/telephony/satellite/SatelliteSubscriberInfo.java

+3 −1
Original line number Diff line number Diff line
@@ -22,8 +22,10 @@ import android.annotation.NonNull; 
import android.annotation.SystemApi;

import android.os.Parcel;

import android.os.Parcelable;

import android.telephony.Rlog;



import com.android.internal.telephony.flags.Flags;

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



import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;
@@ -220,7 +222,7 @@ public final class SatelliteSubscriberInfo implements Parcelable { 
        StringBuilder sb = new StringBuilder();



        sb.append("SubscriberId:");

        sb.append(mSubscriberId);

        sb.append(Rlog.pii(TelephonyUtils.IS_DEBUGGABLE, mSubscriberId));

        sb.append(",");



        sb.append("CarrierId:");

telephony/java/android/telephony/satellite/SatelliteSubscriberProvisionStatus.java

+3 −1
Original line number Diff line number Diff line
@@ -21,8 +21,10 @@ import android.annotation.NonNull; 
import android.annotation.SystemApi;

import android.os.Parcel;

import android.os.Parcelable;

import android.telephony.Rlog;



import com.android.internal.telephony.flags.Flags;

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



import java.util.Objects;
@@ -132,7 +134,7 @@ public final class SatelliteSubscriberProvisionStatus implements Parcelable { 
        StringBuilder sb = new StringBuilder();



        sb.append("SatelliteSubscriberInfo:");

        sb.append(mSubscriberInfo);

        sb.append(Rlog.pii(TelephonyUtils.IS_DEBUGGABLE, mSubscriberInfo));

        sb.append(",");



        sb.append("ProvisionStatus:");