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

Merge "Add support for Telecom logging to obfuscate string phone numbers." am: ae941732bb

Browse Source 
am: bfd852a7bb

Change-Id: Ib27221f30e053ea25d67cbb15625e402a58f6eda
This commit is contained in:
Tyler Gunn
2019-02-19 21:07:09 -08:00
committed by android-build-merger
parent de81b53813 bfd852a7bb
commit 600db05fb1
1 changed files with 29 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
telecomm/java/android/telecom/Log.java
View File

@@ -18,7 +18,6 @@ package android.telecom;
import android.content.Context;
import android.net.Uri;
import android.os.AsyncTask;
import android.os.Build;
import android.telecom.Logging.EventManager;
import android.telecom.Logging.Session;
@@ -29,8 +28,6 @@ import android.text.TextUtils;
import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.util.IndentingPrintWriter;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.IllegalFormatException;
import java.util.Locale;
@@ -373,6 +370,12 @@ public class Log {
return FORCE_LOGGING || android.util.Log.isLoggable(TAG, level);
}
/**
* Generates an obfuscated string for a calling handle in {@link Uri} format, or a raw phone
* phone number in {@link String} format.
* @param pii The information to obfuscate.
* @return The obfuscated string.
*/
public static String piiHandle(Object pii) {
if (pii == null || VERBOSE) {
return String.valueOf(pii);
@@ -389,16 +392,7 @@ public class Log {
String textToObfuscate = uri.getSchemeSpecificPart();
if (PhoneAccount.SCHEME_TEL.equals(scheme)) {
int numDigitsToObfuscate = getDialableCount(textToObfuscate)
- NUM_DIALABLE_DIGITS_TO_LOG;
for (int i = 0; i < textToObfuscate.length(); i++) {
char c = textToObfuscate.charAt(i);
boolean isDialable = PhoneNumberUtils.isDialable(c);
if (isDialable) {
numDigitsToObfuscate--;
}
sb.append(isDialable && numDigitsToObfuscate >= 0 ? "*" : c);
}
obfuscatePhoneNumber(sb, textToObfuscate);
} else if (PhoneAccount.SCHEME_SIP.equals(scheme)) {
for (int i = 0; i < textToObfuscate.length(); i++) {
char c = textToObfuscate.charAt(i);
@@ -410,11 +404,33 @@ public class Log {
} else {
sb.append(pii(pii));
}
} else if (pii instanceof String) {
String number = (String) pii;
obfuscatePhoneNumber(sb, number);
}
return sb.toString();
}
/**
* Obfuscates a phone number, allowing NUM_DIALABLE_DIGITS_TO_LOG digits to be exposed for the
* phone number.
* @param sb String buffer to write obfuscated number to.
* @param phoneNumber The number to obfuscate.
*/
private static void obfuscatePhoneNumber(StringBuilder sb, String phoneNumber) {
int numDigitsToObfuscate = getDialableCount(phoneNumber)
- NUM_DIALABLE_DIGITS_TO_LOG;
for (int i = 0; i < phoneNumber.length(); i++) {
char c = phoneNumber.charAt(i);
boolean isDialable = PhoneNumberUtils.isDialable(c);
if (isDialable) {
numDigitsToObfuscate--;
}
sb.append(isDialable && numDigitsToObfuscate >= 0 ? "*" : c);
}
}
/**
* Determines the number of dialable characters in a string.
* @param toCount The string to count dialable characters in.