Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Id1de2ef64b061cf736257e9ad93b8bf3af522785
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Philip Quinn
2022-05-03 07:18:59 +00:00
committed by Automerger Merge Worker
parent f80a3ee1a1 ec77a90abc
commit ef98914fe0
1 changed files with 8 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
telecomm/java/android/telecom/PhoneAccountHandle.java
View File

@@ -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() // Note: Log.pii called for mId as it can contain personally identifying phone account
.append(mComponentName) // information such as SIP account IDs.
.append(", "); return new StringBuilder().append(mComponentName)
.append(", ")
if (mComponentName.equals(TELEPHONY_COMPONENT_NAME)) { .append(Log.pii(mId))
// Telephony phone account handles are now keyed by subscription id which is not .append(", ")
// sensitive. .append(mUserHandle)
sb.append(mId); .toString();
} 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();
} }
@Override @Override