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

Commit 2ca57a66 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fixed phone number showed in bugreport" into udc-dev

parents 9c97487e 85b23e82

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

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

                + " deviceToDeviceStatusSharingPreference=" + mDeviceToDeviceStatusSharingPreference

                + " isVoImsOptInEnabled=" + mIsVoImsOptInEnabled

                + " isVoImsOptInEnabled=" + mIsVoImsOptInEnabled

                + " deviceToDeviceStatusSharingContacts=" + mDeviceToDeviceStatusSharingContacts

                + " deviceToDeviceStatusSharingContacts=" + mDeviceToDeviceStatusSharingContacts

                + " numberFromCarrier=" + mNumberFromCarrier

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

                + " numberFromIms=" + mNumberFromIms

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

                + " userId=" + mUserId

                + " userId=" + mUserId

                + " isSatelliteEnabled=" + mIsSatelliteEnabled

                + " isSatelliteEnabled=" + mIsSatelliteEnabled

                + " isGroupDisabled=" + mIsGroupDisabled

                + " isGroupDisabled=" + mIsGroupDisabled

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

+3 −1
Original line number Original line 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.UiccPort;

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

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

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

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

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

import com.android.telephony.Rlog;

import com.android.telephony.Rlog;





import java.io.FileDescriptor;

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

    @RequiresPermission(Manifest.permission.MODIFY_PHONE_STATE)

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

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

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

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

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

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

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

        final long identity = Binder.clearCallingIdentity();

        final long identity = Binder.clearCallingIdentity();