Merge "Remove some PII." into gingerbread
diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java
index 7154aee..7242803 100644
--- a/core/java/android/content/Intent.java
+++ b/core/java/android/content/Intent.java
@@ -5267,7 +5267,14 @@
b.append(' ');
}
first = false;
- b.append("dat=").append(mData);
+ b.append("dat=");
+ if (mData.getScheme().equalsIgnoreCase("tel")) {
+ b.append("tel:xxx-xxx-xxxx");
+ } else if (mData.getScheme().equalsIgnoreCase("smsto")) {
+ b.append("smsto:xxx-xxx-xxxx");
+ } else {
+ b.append(mData);
+ }
}
if (mType != null) {
if (!first) {
diff --git a/core/java/android/content/SyncStorageEngine.java b/core/java/android/content/SyncStorageEngine.java
index f9a1637..e1a9dbb 100644
--- a/core/java/android/content/SyncStorageEngine.java
+++ b/core/java/android/content/SyncStorageEngine.java
@@ -411,7 +411,7 @@
}
public void setSyncAutomatically(Account account, String providerName, boolean sync) {
- Log.d(TAG, "setSyncAutomatically: " + account + ", provider " + providerName
+ Log.d(TAG, "setSyncAutomatically: " + /*account +*/ ", provider " + providerName
+ " -> " + sync);
synchronized (mAuthorities) {
AuthorityInfo authority = getOrCreateAuthorityLocked(account, providerName, -1, false);
diff --git a/core/java/android/provider/Telephony.java b/core/java/android/provider/Telephony.java
index bf9e854..6d8bd9b 100644
--- a/core/java/android/provider/Telephony.java
+++ b/core/java/android/provider/Telephony.java
@@ -1205,9 +1205,8 @@
}
Uri uri = uriBuilder.build();
- if (DEBUG) {
- Log.v(TAG, "getOrCreateThreadId uri: " + uri);
- }
+ //if (DEBUG) Log.v(TAG, "getOrCreateThreadId uri: " + uri);
+
Cursor cursor = SqliteWrapper.query(context, context.getContentResolver(),
uri, ID_PROJECTION, null, null, null);
if (DEBUG) {
diff --git a/telephony/java/com/android/internal/telephony/CallerInfo.java b/telephony/java/com/android/internal/telephony/CallerInfo.java
index 360d35e..1e9b930 100644
--- a/telephony/java/com/android/internal/telephony/CallerInfo.java
+++ b/telephony/java/com/android/internal/telephony/CallerInfo.java
@@ -383,8 +383,8 @@
*/
public String toString() {
return new StringBuilder(384)
- .append("\nname: " + name)
- .append("\nphoneNumber: " + phoneNumber)
+ .append("\nname: " + /*name*/ "nnnnnn")
+ .append("\nphoneNumber: " + /*phoneNumber*/ "xxxxxxx")
.append("\ncnapName: " + cnapName)
.append("\nnumberPresentation: " + numberPresentation)
.append("\nnamePresentation: " + namePresentation)
@@ -395,8 +395,8 @@
.append("\nphotoResource: " + photoResource)
.append("\nperson_id: " + person_id)
.append("\nneedUpdate: " + needUpdate)
- .append("\ncontactRefUri: " + contactRefUri)
- .append("\ncontactRingtoneUri: " + contactRefUri)
+ .append("\ncontactRefUri: " + /*contactRefUri*/ "xxxxxxx")
+ .append("\ncontactRingtoneUri: " + /*contactRefUri*/ "xxxxxxx")
.append("\nshouldSendToVoicemail: " + shouldSendToVoicemail)
.append("\ncachedPhoto: " + cachedPhoto)
.append("\nisCachedPhotoCurrent: " + isCachedPhotoCurrent)
diff --git a/telephony/java/com/android/internal/telephony/CallerInfoAsyncQuery.java b/telephony/java/com/android/internal/telephony/CallerInfoAsyncQuery.java
index 25ca559..3419567 100644
--- a/telephony/java/com/android/internal/telephony/CallerInfoAsyncQuery.java
+++ b/telephony/java/com/android/internal/telephony/CallerInfoAsyncQuery.java
@@ -135,7 +135,7 @@
} else {
if (DBG) log("Processing event: " + cw.event + " token (arg1): " + msg.arg1 +
- " command: " + msg.what + " query URI: " + args.uri);
+ " command: " + msg.what + " query URI: " + sanitizeUriToString(args.uri));
switch (cw.event) {
case EVENT_NEW_QUERY:
@@ -297,7 +297,7 @@
OnQueryCompleteListener listener, Object cookie) {
if (DBG) {
log("##### CallerInfoAsyncQuery startQuery()... #####");
- log("- number: " + number);
+ log("- number: " + /*number*/ "xxxxxxx");
log("- cookie: " + cookie);
}
@@ -309,7 +309,7 @@
if (PhoneNumberUtils.isUriNumber(number)) {
// "number" is really a SIP address.
- if (DBG) log(" - Treating number as a SIP address: " + number);
+ if (DBG) log(" - Treating number as a SIP address: " + /*number*/ "xxxxxxx");
// We look up SIP addresses directly in the Data table:
contactRef = Data.CONTENT_URI;
@@ -341,7 +341,7 @@
}
if (DBG) {
- log("==> contactRef: " + contactRef);
+ log("==> contactRef: " + sanitizeUriToString(contactRef));
log("==> selection: " + selection);
if (selectionArgs != null) {
for (int i = 0; i < selectionArgs.length; i++) {
@@ -383,8 +383,8 @@
*/
public void addQueryListener(int token, OnQueryCompleteListener listener, Object cookie) {
- if (DBG) log("adding listener to query: " + mHandler.mQueryUri + " handler: " +
- mHandler.toString());
+ if (DBG) log("adding listener to query: " + sanitizeUriToString(mHandler.mQueryUri) +
+ " handler: " + mHandler.toString());
//create cookieWrapper, add query request to end of queue.
CookieWrapper cw = new CookieWrapper();
@@ -418,6 +418,20 @@
mHandler = null;
}
+ private static String sanitizeUriToString(Uri uri) {
+ if (uri != null) {
+ String uriString = uri.toString();
+ int indexOfLastSlash = uriString.lastIndexOf('/');
+ if (indexOfLastSlash > 0) {
+ return uriString.substring(0, indexOfLastSlash) + "/xxxxxxx";
+ } else {
+ return uriString;
+ }
+ } else {
+ return "";
+ }
+ }
+
/**
* static logging method
*/
diff --git a/telephony/java/com/android/internal/telephony/gsm/SIMRecords.java b/telephony/java/com/android/internal/telephony/gsm/SIMRecords.java
index d711a80..b14896a 100644
--- a/telephony/java/com/android/internal/telephony/gsm/SIMRecords.java
+++ b/telephony/java/com/android/internal/telephony/gsm/SIMRecords.java
@@ -238,7 +238,7 @@
msisdn = number;
msisdnTag = alphaTag;
- if(DBG) log("Set MSISDN: " + msisdnTag +" " + msisdn);
+ if(DBG) log("Set MSISDN: " + msisdnTag + " " + /*msisdn*/ "xxxxxxx");
AdnRecord adn = new AdnRecord(msisdnTag, msisdn);
@@ -496,7 +496,7 @@
imsi = null;
}
- Log.d(LOG_TAG, "IMSI: " + imsi.substring(0, 6) + "xxxxxxxxx");
+ Log.d(LOG_TAG, "IMSI: " + imsi.substring(0, 6) + "xxxxxxx");
if (mncLength == UNKNOWN) {
// the SIM has told us all it knows, but it didn't know the mnc length.
@@ -619,7 +619,7 @@
msisdn = adn.getNumber();
msisdnTag = adn.getAlphaTag();
- Log.d(LOG_TAG, "MSISDN: " + msisdn);
+ Log.d(LOG_TAG, "MSISDN: " + /*msisdn*/ "xxxxxxx");
break;
case EVENT_SET_MSISDN_DONE: