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

Commit efd164f0 authored by Philip Quinn's avatar Philip Quinn Committed by Automerger Merge Worker
Browse files

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

Merge "Revert "Un-obscure the Telephony phone account ID."" into tm-dev am: ec77a90a am: bf3a3353

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



Change-Id: Ia776a9fb61b06ac00f3f298ac58d2d917650445c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 624985c7 bf3a3353

telecomm/java/android/telecom/PhoneAccountHandle.java

+8 −25
Original line number Original line Diff line number Diff line
@@ -46,14 +46,6 @@ 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)
@@ -144,23 +136,14 @@ public final class PhoneAccountHandle implements Parcelable { 




    @Override

    @Override

    public String toString() {

    public String toString() {

        StringBuilder sb = new StringBuilder()

                .append(mComponentName)

                .append(", ");



        if (mComponentName.equals(TELEPHONY_COMPONENT_NAME)) {

            // 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.

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

        return new StringBuilder().append(mComponentName)

        }

                    .append(", ")

        sb.append(", ");

                    .append(Log.pii(mId))

        sb.append(mUserHandle);

                    .append(", ")



                    .append(mUserHandle)

        return sb.toString();

                    .toString();

    }

    }





    @Override

    @Override