Remove some PII.

Change-Id: I4df27119b6bbd28bf950516fd6f44676a8e04f06

core/java/android/content/Intent.java

@@ -5267,7 +5267,14 @@ public class Intent implements Parcelable, Cloneable {
                 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) {

core/java/android/content/SyncStorageEngine.java

@@ -411,7 +411,7 @@ public class SyncStorageEngine extends Handler {
     }
 
     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);

core/java/android/provider/Telephony.java

@@ -1205,9 +1205,8 @@ public final class Telephony {
             }
 
             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) {