commit dc249d4bc311127ba91aac426581d15470d02700
author Makoto Onuki <omakoto@google.com> Wed Apr 29 16:54:50 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 29 16:54:50 2015 +0000
tree e161201e78fe3948bc1a12d15acb4376b8d8b764
parent 7644387a6dc0f563a6f66c29b7646748183899d7
parent 11d45334311f1b2ffa4f6697520939e6ce5b239e

Merge "Fix SIP enterprise lookup" into mnc-dev

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

diff --git a/src/com/android/providers/contacts/ContactsProvider2.java b/src/com/android/providers/contacts/ContactsProvider2.java
index 1eecf0f..5cbca9e 100644
--- a/src/com/android/providers/contacts/ContactsProvider2.java
+++ b/src/com/android/providers/contacts/ContactsProvider2.java
@@ -6838,7 +6838,8 @@
                 .appendPath(phoneNumber)
                 .appendQueryParameter(PhoneLookup.QUERY_PARAMETER_SIP_ADDRESS,
                         String.valueOf(isSipAddress)).build();
-        return queryEnterpriseIfNecessary(localUri, projection, null, null, null, PhoneLookup._ID);
+        return queryEnterpriseIfNecessary(localUri, projection, null, null, null,
+                isSipAddress ? Data.CONTACT_ID : PhoneLookup._ID);
     }
 
     /**