From b3f4db8e2b0a7c5913ee7bf4bef351076b00a52d Mon Sep 17 00:00:00 2001
From: Ficus Kirkpatrick <>
Date: Tue, 24 Mar 2009 21:21:18 -0700
Subject: [PATCH] Automated import from //branches/master/...@141998,141998

---
 core/java/android/provider/Telephony.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/core/java/android/provider/Telephony.java b/core/java/android/provider/Telephony.java
index c8f8b40a97c0f..61ab2288cb6f8 100644
--- a/core/java/android/provider/Telephony.java
+++ b/core/java/android/provider/Telephony.java
@@ -30,6 +30,7 @@ import android.telephony.gsm.SmsMessage;
 import android.text.TextUtils;
 import android.text.util.Regex;
 import android.util.Config;
+import android.util.Log;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -1103,18 +1104,22 @@ public final class Telephony {
                 uriBuilder.appendQueryParameter("recipient", recipient);
             }
 
+            Uri uri = uriBuilder.build();
             Cursor cursor = SqliteWrapper.query(context, context.getContentResolver(),
-                    uriBuilder.build(), ID_PROJECTION, null, null, null);
+                    uri, ID_PROJECTION, null, null, null);
             if (cursor != null) {
                 try {
                     if (cursor.moveToFirst()) {
                         return cursor.getLong(0);
+                    } else {
+                        Log.e(TAG, "getOrCreateThreadId returned no rows!");
                     }
                 } finally {
                     cursor.close();
                 }
             }
 
+            Log.e(TAG, "getOrCreateThreadId failed with uri " + uri.toString());
             throw new IllegalArgumentException("Unable to find or allocate a thread ID.");
         }
     }