From 8f0afb889c0e56ed931790159ed60bcbfbe61521 Mon Sep 17 00:00:00 2001
From: Philip Quinn <pquinn@google.com>
Date: Mon, 2 May 2022 23:17:59 +0000
Subject: [PATCH] Revert "Un-obscure the Telephony phone account ID."

This reverts commit f601004255158ae5ff5b6e2ee2d7740090f8379d.

Reason for revert: b/231244396

Change-Id: Ibc922d80fd85c7a8060d9a8ec667345643dce614
---
 .../android/telecom/PhoneAccountHandle.java   | 33 +++++--------------
 1 file changed, 8 insertions(+), 25 deletions(-)

diff --git a/telecomm/java/android/telecom/PhoneAccountHandle.java b/telecomm/java/android/telecom/PhoneAccountHandle.java
index 287d3f2b60251..e3485deb90803 100644
--- a/telecomm/java/android/telecom/PhoneAccountHandle.java
+++ b/telecomm/java/android/telecom/PhoneAccountHandle.java
@@ -46,14 +46,6 @@ import java.util.Objects;
  * See {@link PhoneAccount}, {@link TelecomManager}.
  */
 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)
     private final ComponentName mComponentName;
     @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023)
@@ -144,23 +136,14 @@ public final class PhoneAccountHandle implements Parcelable {
 
     @Override
     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
-            // information such as SIP account IDs.
-            sb.append(Log.pii(mId));
-        }
-        sb.append(", ");
-        sb.append(mUserHandle);
-
-        return sb.toString();
+        // Note: Log.pii called for mId as it can contain personally identifying phone account
+        // information such as SIP account IDs.
+        return new StringBuilder().append(mComponentName)
+                    .append(", ")
+                    .append(Log.pii(mId))
+                    .append(", ")
+                    .append(mUserHandle)
+                    .toString();
     }
 
     @Override