diff options
author | Daniel Lehmann <lehmannd@google.com> | 2010-04-06 14:17:57 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-06 14:17:57 -0700 |
commit | ba3147d157c7d1ac8ffe2be5abca039430eee64e (patch) | |
tree | 4ef9057b8bd4fb8deaa417b5b2b13abecabc1978 /core/java/com | |
parent | b93107daad8f839b4b234b24af475092168fac89 (diff) | |
parent | 140d040b6a5d2dc01e999e6f7b69863c71b2272b (diff) | |
download | frameworks_base-ba3147d157c7d1ac8ffe2be5abca039430eee64e.zip frameworks_base-ba3147d157c7d1ac8ffe2be5abca039430eee64e.tar.gz frameworks_base-ba3147d157c7d1ac8ffe2be5abca039430eee64e.tar.bz2 |
am 140d040b: am d8b9b511: Merge "Pass cookie to TOKEN_CONTACT_INFO so that QuickContact without photo works again Bug:2572239" into froyo
Merge commit '140d040b6a5d2dc01e999e6f7b69863c71b2272b' into kraken
* commit '140d040b6a5d2dc01e999e6f7b69863c71b2272b':
Pass cookie to TOKEN_CONTACT_INFO so that QuickContact without photo works again
Diffstat (limited to 'core/java/com')
-rw-r--r-- | core/java/com/android/internal/widget/ContactHeaderWidget.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/com/android/internal/widget/ContactHeaderWidget.java b/core/java/com/android/internal/widget/ContactHeaderWidget.java index 333257e..f421466 100644 --- a/core/java/com/android/internal/widget/ContactHeaderWidget.java +++ b/core/java/com/android/internal/widget/ContactHeaderWidget.java @@ -489,7 +489,7 @@ public class ContactHeaderWidget extends FrameLayout implements View.OnClickList resetAsyncQueryHandler(); } - mQueryHandler.startQuery(TOKEN_CONTACT_INFO, null, contactUri, ContactQuery.COLUMNS, + mQueryHandler.startQuery(TOKEN_CONTACT_INFO, contactUri, contactUri, ContactQuery.COLUMNS, null, null, null); } |