commit a42880749b368e60caee77dd682d434e48ca96bd
author Wink Saville <wink@google.com> Tue Oct 12 12:36:38 2010 -0700
committer Wink Saville <wink@google.com> Tue Oct 12 12:36:38 2010 -0700
tree 8763f1b0c46ad5e9871775f4c68240c1ddcb1dff
parent 844a6b3ccaff1ad1443ad985e4527b733ce97c0e

Remove some PII.

Change-Id: I4df27119b6bbd28bf950516fd6f44676a8e04f06

core/java/android/content/Intent.java

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) {

core/java/android/content/SyncStorageEngine.java

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);

core/java/android/provider/Telephony.java

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) {