commit 7906f55e82ab84356e56d10d0336079145e04a38
author Jeff Sharkey <jsharkey@android.com> Wed Aug 05 17:31:35 2009 -0700
committer Jeff Sharkey <jsharkey@android.com> Wed Aug 05 17:31:35 2009 -0700
tree f127ef7845f90af0b6e9351cb3d2b8b6a5ebf54e
parent 00ec508630251d6c6e3746469c9428f5a8cd5996

Fix social projection that had ambiguous column name.

src/com/android/providers/contacts/SocialProvider.java

diff --git a/src/com/android/providers/contacts/SocialProvider.java b/src/com/android/providers/contacts/SocialProvider.java
index a5ea0c9..a4e68d7 100644
--- a/src/com/android/providers/contacts/SocialProvider.java
+++ b/src/com/android/providers/contacts/SocialProvider.java
@@ -17,6 +17,7 @@
 package com.android.providers.contacts;
 
 import com.android.providers.contacts.OpenHelper.ActivitiesColumns;
+import com.android.providers.contacts.OpenHelper.ContactsColumns;
 import com.android.providers.contacts.OpenHelper.PackagesColumns;
 import com.android.providers.contacts.OpenHelper.Tables;
 
@@ -83,7 +84,8 @@
 
         // Contacts projection map
         columns = new HashMap<String, String>();
-        columns.put(Contacts.DISPLAY_NAME, Contacts.DISPLAY_NAME);
+        columns.put(Contacts.DISPLAY_NAME, ContactsColumns.CONCRETE_DISPLAY_NAME + " AS "
+                + Contacts.DISPLAY_NAME);
         sContactsProjectionMap = columns;
 
         // Contacts projection map