diff options
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/content/Intent.java | 9 | ||||
| -rw-r--r-- | core/java/android/content/SyncStorageEngine.java | 2 | ||||
| -rw-r--r-- | core/java/android/provider/Telephony.java | 5 |
3 files changed, 11 insertions, 5 deletions
diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index 7154aeee08d4..72428036dac9 100644 --- a/core/java/android/content/Intent.java +++ b/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) { diff --git a/core/java/android/content/SyncStorageEngine.java b/core/java/android/content/SyncStorageEngine.java index f9a16379b571..e1a9dbbe629b 100644 --- a/core/java/android/content/SyncStorageEngine.java +++ b/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); diff --git a/core/java/android/provider/Telephony.java b/core/java/android/provider/Telephony.java index bf9e8549aaaf..6d8bd9ba573c 100644 --- a/core/java/android/provider/Telephony.java +++ b/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) { |