am db7dde6b: am bb54f93f: Merge change 23527 into eclair

Merge commit 'db7dde6bd3f6352bb9af3b03232a9407a53d87e2'

* commit 'db7dde6bd3f6352bb9af3b03232a9407a53d87e2':
  Adding a convenience method to resolve contact lookup URI to a regular content URI

core/java/android/provider/ContactsContract.java

@@ -288,6 +288,32 @@ public final class ContactsContract {
             return null;
         }
 
+        /**
+         * Computes a content URI (see {@link #CONTENT_URI}) given a lookup URI.
+         * <p>
+         * Returns null if the contact cannot be found.
+         */
+        public static Uri lookupContact(ContentResolver resolver, Uri lookupUri) {
+            if (lookupUri == null) {
+                return null;
+            }
+
+            Cursor c = resolver.query(lookupUri, new String[]{Contacts._ID}, null, null, null);
+            if (c == null) {
+                return null;
+            }
+
+            try {
+                if (c.moveToFirst()) {
+                    long contactId = c.getLong(0);
+                    return ContentUris.withAppendedId(Contacts.CONTENT_URI, contactId);
+                }
+            } finally {
+                c.close();
+            }
+            return null;
+        }
+
         /**
          * The content:// style URI for this table joined with useful data from
          * {@link Data}.