Revert "Query skype mime type when getting CALLABLE contacts"HEADreplicant-6.0-0004-transitionreplicant-6.0-0004-rc6replicant-6.0-0004-rc5-transitionreplicant-6.0-0004-rc5replicant-6.0-0004-rc4replicant-6.0-0004replicant-6.0

This reverts commit 01c7baf0157231d9231853ea812d97646c779e5b.

In the patch set to remove the Ambient SDK, belgin gave me the
following commit has to use in this repository:
    edec4c11c704e9908f1d4f915a4ec2e0eefe54fe
    edec4c11 Automatic translation import

However the commit right before the introduction of the Ambient
SDK is the one being reverted:
    01c7baf0157231d9231853ea812d97646c779e5b
    01c7baf0 Query skype mime type when getting CALLABLE contacts

As Skype is not free software and that this commit explains clearly
that it contains skype specific parts ("TODO: pass in mime type so
that this is not skype specific") and that the Ambient SDK was
probably tested by Belgin without this commit, it's safe to
revert it.

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>

1 files changed, 2 insertions, 6 deletions

diff --git a/src/com/android/providers/contacts/ContactsProvider2.java b/src/com/android/providers/contacts/ContactsProvider2.java
index 2182aca2..67719cce 100644
--- a/src/com/android/providers/contacts/ContactsProvider2.java
+++ b/src/com/android/providers/contacts/ContactsProvider2.java
@@ -5805,12 +5805,10 @@ public class ContactsProvider2 extends AbstractContactsProvider
                         DataColumns.MIMETYPE_ID + "=" + mDbHelper.get().getMimeTypeIdForPhone();
                 final String mimeTypeIsSipExpression =
                         DataColumns.MIMETYPE_ID + "=" + mDbHelper.get().getMimeTypeIdForSip();
-                final String mimeTypeIsSkypeExpression = DataColumns.MIMETYPE_ID + "="
-                        + mDbHelper.get().getMimeTypeId("vnd.android.cursor.item/com.skype.android.skypecall.action"); 
                 setTablesAndProjectionMapForData(qb, uri, projection, false);
                 if (match == CALLABLES) {
                     qb.appendWhere(" AND ((" + mimeTypeIsPhoneExpression +
-                            ") OR (" + mimeTypeIsSipExpression + ") OR (" + mimeTypeIsSkypeExpression + "))");
+                            ") OR (" + mimeTypeIsSipExpression + "))");
                 } else {
                     qb.appendWhere(" AND " + mimeTypeIsPhoneExpression);
                 }
@@ -5857,8 +5855,6 @@ public class ContactsProvider2 extends AbstractContactsProvider
                         DataColumns.MIMETYPE_ID + "=" + mDbHelper.get().getMimeTypeIdForPhone();
                 final String mimeTypeIsSipExpression =
                         DataColumns.MIMETYPE_ID + "=" + mDbHelper.get().getMimeTypeIdForSip();
-                final String mimeTypeIsSkypeExpression = DataColumns.MIMETYPE_ID + "="
-                        + mDbHelper.get().getMimeTypeId("vnd.android.cursor.item/com.skype.android.skypecall.action"); 
 
                 String typeParam = uri.getQueryParameter(DataUsageFeedback.USAGE_TYPE);
                 final int typeInt = getDataUsageFeedbackType(typeParam,
@@ -5866,7 +5862,7 @@ public class ContactsProvider2 extends AbstractContactsProvider
                 setTablesAndProjectionMapForData(qb, uri, projection, true, typeInt);
                 if (match == CALLABLES_FILTER) {
                     qb.appendWhere(" AND ((" + mimeTypeIsPhoneExpression +
-                            ") OR (" + mimeTypeIsSipExpression + ") OR (" + mimeTypeIsSkypeExpression + "))");
+                            ") OR (" + mimeTypeIsSipExpression + "))");
                 } else {
                     qb.appendWhere(" AND " + mimeTypeIsPhoneExpression);
                 }