commit 25a49b6c4d1bb0e438f650b99cbe1b01dea6ae43
author Yorke Lee <yorkelee@google.com> Tue Oct 08 17:44:46 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Oct 08 17:44:46 2013 -0700
tree 9ef1a4f081221c10a4820d4deb9a5bb4bfb8710f
parent 133c4a3d6b7cc3a5efa95fe1c93a0e49e1b08dcc
parent a6965beee5578785286ec3c522b0f1dc3a3600aa

am a6965bee: am a4bd0ba6: am 7d0513e0: Merge "Don\'t show PII in logs for JSON-encoded uris" into klp-dev

* commit 'a6965beee5578785286ec3c522b0f1dc3a3600aa':
  Don't show PII in logs for JSON-encoded uris

src/com/android/dialer/calllog/ContactInfoHelper.java

diff --git a/src/com/android/dialer/calllog/ContactInfoHelper.java b/src/com/android/dialer/calllog/ContactInfoHelper.java
index bcba9ff..bcb98fd 100644
--- a/src/com/android/dialer/calllog/ContactInfoHelper.java
+++ b/src/com/android/dialer/calllog/ContactInfoHelper.java
@@ -130,9 +130,9 @@
 
             return Contacts.CONTENT_LOOKUP_URI.buildUpon()
                     .appendPath(Constants.LOOKUP_URI_ENCODED)
-                    .appendQueryParameter(Constants.LOOKUP_URI_JSON, jsonString)
                     .appendQueryParameter(ContactsContract.DIRECTORY_PARAM_KEY,
                             String.valueOf(Long.MAX_VALUE))
+                    .encodedFragment(jsonString)
                     .build();
         } catch (JSONException e) {
             return null;