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

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

Browse Source
This commit is contained in:
TreeHugger Robot
2022-05-02 20:35:30 +00:00
committed by Android (Google) Code Review
parent 4fdd1e0778 f601004255
commit fc9fdfe2a7
1 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -46,6 +46,14 @@ 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)
@@ -136,14 +144,23 @@ public final class PhoneAccountHandle implements Parcelable {
@Override
public String 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();
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();
}
@Override