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

Commit 95c92155 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Un-obscure the Telephony phone account ID." into tm-dev am: 3ff037cb am: 3c4093be 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18203217



Change-Id: I66952cab244d05d34fd0fc6f61b7b7e494e7fe21
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 80cc551a 3c4093be

telecomm/java/android/telecom/PhoneAccountHandle.java

+25 −8
Original line number Original line Diff line number Diff line
@@ -46,6 +46,14 @@ import java.util.Objects; 
 * See {@link PhoneAccount}, {@link TelecomManager}.

 * See {@link PhoneAccount}, {@link TelecomManager}.

 */

 */

public final class PhoneAccountHandle implements Parcelable {

public final class PhoneAccountHandle implements Parcelable {

    /**

     * Expected component name of Telephony phone accounts; ONLY used to determine if we should log

     * the phone account handle ID.

     */

    private static final ComponentName TELEPHONY_COMPONENT_NAME =

            new ComponentName("com.android.phone",

                    "com.android.services.telephony.TelephonyConnectionService");



    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 127403196)

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 127403196)

    private final ComponentName mComponentName;

    private final ComponentName mComponentName;

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023)

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023)
@@ -136,14 +144,23 @@ public final class PhoneAccountHandle implements Parcelable { 




    @Override

    @Override

    public String toString() {

    public String toString() {

        StringBuilder sb = new StringBuilder()

                .append(mComponentName)

                .append(", ");



        if (TELEPHONY_COMPONENT_NAME.equals(mComponentName)) {

            // Telephony phone account handles are now keyed by subscription id which is not

            // sensitive.

            sb.append(mId);

        } else {

            // Note: Log.pii called for mId as it can contain personally identifying phone account

            // Note: Log.pii called for mId as it can contain personally identifying phone account

            // information such as SIP account IDs.

            // information such as SIP account IDs.

        return new StringBuilder().append(mComponentName)

            sb.append(Log.pii(mId));

                    .append(", ")

        }

                    .append(Log.pii(mId))

        sb.append(", ");

                    .append(", ")

        sb.append(mUserHandle);

                    .append(mUserHandle)



                    .toString();

        return sb.toString();

    }

    }





    @Override

    @Override