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

Commit 85b23e82 authored by Jack Yu's avatar Jack Yu
Browse files

Fixed phone number showed in bugreport 

Protected phone numbers with Rlog.pii.

Fix: 257116872
Test: Boot up and collect bugreport to check phone number
      not printed.
Change-Id: If99f08732928714eb097c54727ec15462dbbde9d
parent c5f03b59

src/java/com/android/internal/telephony/subscription/SubscriptionInfoInternal.java

+2 −2
Original line number Diff line number Diff line
@@ -1113,8 +1113,8 @@ public class SubscriptionInfoInternal { 
                + " deviceToDeviceStatusSharingPreference=" + mDeviceToDeviceStatusSharingPreference

                + " isVoImsOptInEnabled=" + mIsVoImsOptInEnabled

                + " deviceToDeviceStatusSharingContacts=" + mDeviceToDeviceStatusSharingContacts

                + " numberFromCarrier=" + mNumberFromCarrier

                + " numberFromIms=" + mNumberFromIms

                + " numberFromCarrier=" + Rlog.pii(TelephonyUtils.IS_DEBUGGABLE, mNumberFromCarrier)

                + " numberFromIms=" + Rlog.pii(TelephonyUtils.IS_DEBUGGABLE, mNumberFromIms)

                + " userId=" + mUserId

                + " isSatelliteEnabled=" + mIsSatelliteEnabled

                + " isGroupDisabled=" + mIsGroupDisabled

src/java/com/android/internal/telephony/subscription/SubscriptionManagerService.java

+3 −1
Original line number Diff line number Diff line
@@ -102,6 +102,7 @@ import com.android.internal.telephony.uicc.UiccController; 
import com.android.internal.telephony.uicc.UiccPort;

import com.android.internal.telephony.uicc.UiccSlot;

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

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

import com.android.telephony.Rlog;



import java.io.FileDescriptor;
@@ -2155,7 +2156,8 @@ public class SubscriptionManagerService extends ISub.Stub { 
    @RequiresPermission(Manifest.permission.MODIFY_PHONE_STATE)

    public int setDisplayNumber(@NonNull String number, int subId) {

        enforcePermissions("setDisplayNumber", Manifest.permission.MODIFY_PHONE_STATE);

        logl("setDisplayNumber: subId=" + subId + ", number=" + number

        logl("setDisplayNumber: subId=" + subId + ", number="

                + Rlog.pii(TelephonyUtils.IS_DEBUGGABLE, number)

                + ", calling package=" + getCallingPackage());

        // Now that all security checks passes, perform the operation as ourselves.

        final long identity = Binder.clearCallingIdentity();