am d5ffa12d: Merge change 26127 into eclair

Merge commit 'd5ffa12dea99233e6a75048d82ad4daf0373191f' into eclair-plus-aosp

* commit 'd5ffa12dea99233e6a75048d82ad4daf0373191f':
  Uri encode phone number before passing it to query.

core/java/com/android/internal/widget/ContactHeaderWidget.java

@@ -402,7 +402,7 @@ public class ContactHeaderWidget extends FrameLayout implements View.OnClickList
      */
     public void bindFromPhoneNumber(String number) {
         mQueryHandler.startQuery(TOKEN_PHONE_LOOKUP, number,
-                Uri.withAppendedPath(PhoneLookup.CONTENT_FILTER_URI, number),
+                Uri.withAppendedPath(PhoneLookup.CONTENT_FILTER_URI, Uri.encode(number)),
                 PHONE_LOOKUP_PROJECTION, null, null, null);
     }