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

Commit 4d4b0806 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 fcd8bc64 d46ce473

src/java/com/android/internal/telephony/satellite/SatelliteController.java

+14 −8
Original line number Original line Diff line number Diff line
@@ -5643,7 +5643,8 @@ public class SatelliteController extends Handler { 
                            .isSatelliteProvisionedForNonIpDatagram(subId);

                            .isSatelliteProvisionedForNonIpDatagram(subId);

                    if (Provisioned) {

                    if (Provisioned) {

                        mProvisionedSubscriberId.put(subscriberId, true);

                        mProvisionedSubscriberId.put(subscriberId, true);

                        logd("updateSatelliteProvisionStatePerSubscriberId: " + subscriberId

                        logd("updateSatelliteProvisionStatePerSubscriberId: "

                                + Rlog.pii(TelephonyUtils.IS_DEBUGGABLE, subscriberId)

                                + " set true");

                                + " set true");

                    }

                    }

                }

                }
@@ -7285,8 +7286,9 @@ public class SatelliteController extends Handler { 
            subscriberId = getPhoneNumberBasedCarrier(info.getSubscriptionId());

            subscriberId = getPhoneNumberBasedCarrier(info.getSubscriptionId());

            subscriberIdType = SatelliteSubscriberInfo.SUBSCRIBER_ID_TYPE_IMSI_MSISDN;

            subscriberIdType = SatelliteSubscriberInfo.SUBSCRIBER_ID_TYPE_IMSI_MSISDN;

        }

        }

        logd("getSubscriberIdAndType: subscriberId=" + subscriberId + ", subscriberIdType="

        logd("getSubscriberIdAndType: subscriberId="

                + subscriberIdType);

                + Rlog.pii(TelephonyUtils.IS_DEBUGGABLE, subscriberId)

                + ", subscriberIdType=" + subscriberIdType);

        return new Pair<>(subscriberId, subscriberIdType);

        return new Pair<>(subscriberId, subscriberIdType);

    }

    }
@@ -7332,7 +7334,8 @@ public class SatelliteController extends Handler { 




        subscriberId = internal.getImsi().substring(0, 6)

        subscriberId = internal.getImsi().substring(0, 6)

                + phoneNumber.replaceFirst("^\\+", "");

                + phoneNumber.replaceFirst("^\\+", "");

        plogd("getPhoneNumberBasedCarrier: subscriberId=" + subscriberId);

        plogd("getPhoneNumberBasedCarrier: subscriberId="

                + Rlog.pii(TelephonyUtils.IS_DEBUGGABLE, subscriberId));

        return subscriberId;

        return subscriberId;

    }

    }
@@ -7476,8 +7479,10 @@ public class SatelliteController extends Handler { 
                    int carrierId = info.getCarrierId();

                    int carrierId = info.getCarrierId();

                    String apn = getConfigForSubId(info.getSubscriptionId())

                    String apn = getConfigForSubId(info.getSubscriptionId())

                            .getString(KEY_SATELLITE_NIDD_APN_NAME_STRING, "");

                            .getString(KEY_SATELLITE_NIDD_APN_NAME_STRING, "");

                    logd("getPrioritySatelliteSubscriberProvisionStatusList: subscriberId:"

                    logd("getPrioritySatelliteSubscriberProvisionStatusList:"

                            + subscriberId + " , carrierId=" + carrierId + " , apn=" + apn);

                            + " subscriberId:"

                            + Rlog.pii(TelephonyUtils.IS_DEBUGGABLE, subscriberId)

                            + " , carrierId=" + carrierId + " , apn=" + apn);

                    if (subscriberId.isEmpty()) {

                    if (subscriberId.isEmpty()) {

                        logd("getPrioritySatelliteSubscriberProvisionStatusList: getSubscriberId "

                        logd("getPrioritySatelliteSubscriberProvisionStatusList: getSubscriberId "

                                + "failed skip this subscriberId.");

                                + "failed skip this subscriberId.");
@@ -8329,8 +8334,9 @@ public class SatelliteController extends Handler { 
        int carrierId = subInfo.getCarrierId();

        int carrierId = subInfo.getCarrierId();

        String apn = getConfigForSubId(subInfo.getSubscriptionId())

        String apn = getConfigForSubId(subInfo.getSubscriptionId())

                .getString(KEY_SATELLITE_NIDD_APN_NAME_STRING, "");

                .getString(KEY_SATELLITE_NIDD_APN_NAME_STRING, "");

        logd("getSatelliteSubscriberInfo: subInfo: " + subInfo + ", subscriberId:"

        logd("getSatelliteSubscriberInfo: subInfo: " + subInfo

                + subscriberId + " , carrierId=" + carrierId + " , apn=" + apn);

                + ", subscriberId:" + Rlog.pii(TelephonyUtils.IS_DEBUGGABLE, subscriberId)

                + " , carrierId=" + carrierId + " , apn=" + apn);

        if (subscriberId.isEmpty()) {

        if (subscriberId.isEmpty()) {

            logw("getSatelliteSubscriberInfo: not a satellite subscription.");

            logw("getSatelliteSubscriberInfo: not a satellite subscription.");

            return null;

            return null;