Merge "Remove some PII." into gingerbread

This commit is contained in:
Wink Saville
2010-10-12 14:17:00 -07:00
committed by Android (Google) Code Review
6 changed files with 38 additions and 18 deletions

View File

@ -5267,7 +5267,14 @@ public class Intent implements Parcelable, Cloneable {
b.append(' '); b.append(' ');
} }
first = false; 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 (mType != null) {
if (!first) { if (!first) {

View File

@ -411,7 +411,7 @@ public class SyncStorageEngine extends Handler {
} }
public void setSyncAutomatically(Account account, String providerName, boolean sync) { public void setSyncAutomatically(Account account, String providerName, boolean sync) {
Log.d(TAG, "setSyncAutomatically: " + account + ", provider " + providerName Log.d(TAG, "setSyncAutomatically: " + /*account +*/ ", provider " + providerName
+ " -> " + sync); + " -> " + sync);
synchronized (mAuthorities) { synchronized (mAuthorities) {
AuthorityInfo authority = getOrCreateAuthorityLocked(account, providerName, -1, false); AuthorityInfo authority = getOrCreateAuthorityLocked(account, providerName, -1, false);

View File

@ -1205,9 +1205,8 @@ public final class Telephony {
} }
Uri uri = uriBuilder.build(); Uri uri = uriBuilder.build();
if (DEBUG) { //if (DEBUG) Log.v(TAG, "getOrCreateThreadId uri: " + uri);
Log.v(TAG, "getOrCreateThreadId uri: " + uri);
}
Cursor cursor = SqliteWrapper.query(context, context.getContentResolver(), Cursor cursor = SqliteWrapper.query(context, context.getContentResolver(),
uri, ID_PROJECTION, null, null, null); uri, ID_PROJECTION, null, null, null);
if (DEBUG) { if (DEBUG) {

View File

@ -383,8 +383,8 @@ public class CallerInfo {
*/ */
public String toString() { public String toString() {
return new StringBuilder(384) return new StringBuilder(384)
.append("\nname: " + name) .append("\nname: " + /*name*/ "nnnnnn")
.append("\nphoneNumber: " + phoneNumber) .append("\nphoneNumber: " + /*phoneNumber*/ "xxxxxxx")
.append("\ncnapName: " + cnapName) .append("\ncnapName: " + cnapName)
.append("\nnumberPresentation: " + numberPresentation) .append("\nnumberPresentation: " + numberPresentation)
.append("\nnamePresentation: " + namePresentation) .append("\nnamePresentation: " + namePresentation)
@ -395,8 +395,8 @@ public class CallerInfo {
.append("\nphotoResource: " + photoResource) .append("\nphotoResource: " + photoResource)
.append("\nperson_id: " + person_id) .append("\nperson_id: " + person_id)
.append("\nneedUpdate: " + needUpdate) .append("\nneedUpdate: " + needUpdate)
.append("\ncontactRefUri: " + contactRefUri) .append("\ncontactRefUri: " + /*contactRefUri*/ "xxxxxxx")
.append("\ncontactRingtoneUri: " + contactRefUri) .append("\ncontactRingtoneUri: " + /*contactRefUri*/ "xxxxxxx")
.append("\nshouldSendToVoicemail: " + shouldSendToVoicemail) .append("\nshouldSendToVoicemail: " + shouldSendToVoicemail)
.append("\ncachedPhoto: " + cachedPhoto) .append("\ncachedPhoto: " + cachedPhoto)
.append("\nisCachedPhotoCurrent: " + isCachedPhotoCurrent) .append("\nisCachedPhotoCurrent: " + isCachedPhotoCurrent)

View File

@ -135,7 +135,7 @@ public class CallerInfoAsyncQuery {
} else { } else {
if (DBG) log("Processing event: " + cw.event + " token (arg1): " + msg.arg1 + 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) { switch (cw.event) {
case EVENT_NEW_QUERY: case EVENT_NEW_QUERY:
@ -297,7 +297,7 @@ public class CallerInfoAsyncQuery {
OnQueryCompleteListener listener, Object cookie) { OnQueryCompleteListener listener, Object cookie) {
if (DBG) { if (DBG) {
log("##### CallerInfoAsyncQuery startQuery()... #####"); log("##### CallerInfoAsyncQuery startQuery()... #####");
log("- number: " + number); log("- number: " + /*number*/ "xxxxxxx");
log("- cookie: " + cookie); log("- cookie: " + cookie);
} }
@ -309,7 +309,7 @@ public class CallerInfoAsyncQuery {
if (PhoneNumberUtils.isUriNumber(number)) { if (PhoneNumberUtils.isUriNumber(number)) {
// "number" is really a SIP address. // "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: // We look up SIP addresses directly in the Data table:
contactRef = Data.CONTENT_URI; contactRef = Data.CONTENT_URI;
@ -341,7 +341,7 @@ public class CallerInfoAsyncQuery {
} }
if (DBG) { if (DBG) {
log("==> contactRef: " + contactRef); log("==> contactRef: " + sanitizeUriToString(contactRef));
log("==> selection: " + selection); log("==> selection: " + selection);
if (selectionArgs != null) { if (selectionArgs != null) {
for (int i = 0; i < selectionArgs.length; i++) { for (int i = 0; i < selectionArgs.length; i++) {
@ -383,8 +383,8 @@ public class CallerInfoAsyncQuery {
*/ */
public void addQueryListener(int token, OnQueryCompleteListener listener, Object cookie) { public void addQueryListener(int token, OnQueryCompleteListener listener, Object cookie) {
if (DBG) log("adding listener to query: " + mHandler.mQueryUri + " handler: " + if (DBG) log("adding listener to query: " + sanitizeUriToString(mHandler.mQueryUri) +
mHandler.toString()); " handler: " + mHandler.toString());
//create cookieWrapper, add query request to end of queue. //create cookieWrapper, add query request to end of queue.
CookieWrapper cw = new CookieWrapper(); CookieWrapper cw = new CookieWrapper();
@ -418,6 +418,20 @@ public class CallerInfoAsyncQuery {
mHandler = null; 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 * static logging method
*/ */

View File

@ -238,7 +238,7 @@ public final class SIMRecords extends IccRecords {
msisdn = number; msisdn = number;
msisdnTag = alphaTag; msisdnTag = alphaTag;
if(DBG) log("Set MSISDN: " + msisdnTag +" " + msisdn); if(DBG) log("Set MSISDN: " + msisdnTag + " " + /*msisdn*/ "xxxxxxx");
AdnRecord adn = new AdnRecord(msisdnTag, msisdn); AdnRecord adn = new AdnRecord(msisdnTag, msisdn);
@ -496,7 +496,7 @@ public final class SIMRecords extends IccRecords {
imsi = null; 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) { if (mncLength == UNKNOWN) {
// the SIM has told us all it knows, but it didn't know the mnc length. // the SIM has told us all it knows, but it didn't know the mnc length.
@ -619,7 +619,7 @@ public final class SIMRecords extends IccRecords {
msisdn = adn.getNumber(); msisdn = adn.getNumber();
msisdnTag = adn.getAlphaTag(); msisdnTag = adn.getAlphaTag();
Log.d(LOG_TAG, "MSISDN: " + msisdn); Log.d(LOG_TAG, "MSISDN: " + /*msisdn*/ "xxxxxxx");
break; break;
case EVENT_SET_MSISDN_DONE: case EVENT_SET_MSISDN_DONE: