commit 7e7a06a4e90c8b6dd0d80154ded7c72ea4e86ccb
author Walter Jang <wjang@google.com> Tue Aug 11 17:21:15 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Aug 11 17:21:15 2015 +0000
tree a4f1859e4aa1524e7a8914aaf5f4750a4bac0b6e
parent 4f14cf9a779e4b15b9f745ceacc7d96f085b3a45
parent 104bf0ac0e6b917f980fb99b249d567a1792ad2b

am 104bf0ac: am f7483e59: am d37af1cf: Encode read-only lookupKeys twice so multi vcard URI can split on :

* commit '104bf0ac0e6b917f980fb99b249d567a1792ad2b':
  Encode read-only lookupKeys twice so multi vcard URI can split on :

src/com/android/contacts/activities/PeopleActivity.java

diff --git a/src/com/android/contacts/activities/PeopleActivity.java b/src/com/android/contacts/activities/PeopleActivity.java
index 1591866..97c6ea0 100644
--- a/src/com/android/contacts/activities/PeopleActivity.java
+++ b/src/com/android/contacts/activities/PeopleActivity.java
@@ -1246,7 +1246,7 @@
             final Uri contactUri = ContentUris.withAppendedId(Contacts.CONTENT_URI, contactId);
             final Uri lookupUri = Contacts.getLookupUri(getContentResolver(), contactUri);
             List<String> pathSegments = lookupUri.getPathSegments();
-            uriListBuilder.append(pathSegments.get(pathSegments.size() - 2));
+            uriListBuilder.append(Uri.encode(pathSegments.get(pathSegments.size() - 2)));
             firstIteration = false;
         }
         final Uri uri = Uri.withAppendedPath(