Fix build err for wearable

Change-Id: Icfbbc9f4af31e25e065bc2ea3bf3e9b858a947c4

diff --git a/include/utils/MsgContact.h b/include/utils/MsgContact.h
index 0ca3f67..235635b 100755 (executable)
--- a/include/utils/MsgContact.h
+++ b/include/utils/MsgContact.h
@@ -23,7 +23,6 @@
 #include "MsgStorageTypes.h"
 #include "MsgInternalTypes.h"
 
-#ifndef MSG_CONTACTS_SERVICE_NOT_SUPPORTED
 /*==================================================================================================
                                      FUNCTION PROTOTYPES
 ==================================================================================================*/
@@ -42,7 +41,6 @@ void MsgAddPhoneLog(const MSG_MESSAGE_INFO_S *pMsgInfo);
 void MsgDeletePhoneLog(msg_message_id_t msgId);
 
 bool checkBlockingMode(char *address, bool *pisFavorites);
-#endif /* MSG_CONTACTS_SERVICE_NOT_SUPPORTED */
 
 int MsgContactGetMinMatchDigit();
 void MsgConvertNumber(const char* pSrcNum, char* pDestNum, int destSize);

diff --git a/include/utils/MsgUtilStorage.h b/include/utils/MsgUtilStorage.h
index 354c876..4255fd9 100755 (executable)
--- a/include/utils/MsgUtilStorage.h
+++ b/include/utils/MsgUtilStorage.h
@@ -39,19 +39,9 @@ msg_error_t MsgStocheckMemoryStatus();
 int MsgStoCheckMsgCntLimit(const MSG_MESSAGE_TYPE_S* pMsgType, msg_folder_id_t FolderId);
 
 msg_error_t MsgStoAddAddress(MsgDbHandler *pDbHandle, const MSG_MESSAGE_INFO_S *pMsg, msg_thread_id_t *pConvId);
-
-/* contacts-service is not used for gear */
-#ifndef MSG_CONTACTS_SERVICE_NOT_SUPPORTED
 msg_error_t MsgStoGetAddressByMsgId(MsgDbHandler *pDbHandle, msg_message_id_t msgId, int contactNameOrder, int *nAddressCnt, MSG_ADDRESS_INFO_S **pAddress);
 msg_error_t MsgStoGetAddressByMsgId(MsgDbHandler *pDbHandle, msg_message_id_t msgId, int contactNameOrder, msg_struct_list_s *pAddress);
 msg_error_t MsgStoGetAddressByConvId(MsgDbHandler *pDbHandle, msg_thread_id_t convId, int contactNameOrder, msg_struct_list_s *pAddrlist);
-#else /* MSG_CONTACTS_SERVICE_NOT_SUPPORTED */
-/* contactNameOrder is never used */
-msg_error_t MsgStoGetAddressByMsgId(MsgDbHandler *pDbHandle, msg_message_id_t msgId, int *nAddressCnt, MSG_ADDRESS_INFO_S **pAddress);
-msg_error_t MsgStoGetAddressByMsgId(MsgDbHandler *pDbHandle, msg_message_id_t msgId, msg_struct_list_s *pAddress);
-msg_error_t MsgStoGetAddressByConvId(MsgDbHandler *pDbHandle, msg_thread_id_t convId, msg_struct_list_s *pAddrlist);
-#endif /* MSG_CONTACTS_SERVICE_NOT_SUPPORTED */
-
 void MsgStoUpdateAddress(MsgDbHandler *pDbHandle, const MSG_MESSAGE_INFO_S *pMsg, msg_thread_id_t convId);
 msg_error_t MsgStoAddConversation(MsgDbHandler *pDbHandle, msg_thread_id_t *pConvId);
 msg_error_t MsgStoUpdateConversation(MsgDbHandler *pDbHandle, msg_thread_id_t convId);

diff --git a/plugin/sms_plugin/SmsPluginTransport.cpp b/plugin/sms_plugin/SmsPluginTransport.cpp
index 1330a46..bdc976a 100755 (executable)
--- a/plugin/sms_plugin/SmsPluginTransport.cpp
+++ b/plugin/sms_plugin/SmsPluginTransport.cpp
@@ -101,14 +101,7 @@ void SmsPluginTransport::submitRequest(SMS_REQUEST_INFO_S *pReqInfo)
 
        /* Get address informations. */
        MsgDbHandler *dbHandle = getDbHandle();
-       /* contacts-service is not used for gear */
-#ifndef MSG_CONTACTS_SERVICE_NOT_SUPPORTED
        MsgStoGetAddressByMsgId(dbHandle, pReqInfo->msgInfo.msgId, 0, &pReqInfo->msgInfo.nAddressCnt, &pReqInfo->msgInfo.addressList);
-#else /* MSG_CONTACTS_SERVICE_NOT_SUPPORTED */
-       /* contactNameOrder is never used */
-       MsgStoGetAddressByMsgId(dbHandle, pReqInfo->msgInfo.msgId, &pReqInfo->msgInfo.nAddressCnt, &pReqInfo->msgInfo.addressList);
-#endif /* MSG_CONTACTS_SERVICE_NOT_SUPPORTED */
-
        MSG_DEBUG("pReqInfo->msgInfo.nAddressCnt [%d]", pReqInfo->msgInfo.nAddressCnt);
 
        /* Get MSISDN */

diff --git a/utils/MsgContact.cpp b/utils/MsgContact.cpp
index 02d898e..b6f35ca 100755 (executable)
--- a/utils/MsgContact.cpp
+++ b/utils/MsgContact.cpp
@@ -24,9 +24,7 @@
 
 extern "C"
 {
-#ifndef MSG_CONTACTS_SERVICE_NOT_SUPPORTED
        #include <contacts.h>
-#endif /* MSG_CONTACTS_SERVICE_NOT_SUPPORTED */
 }
 
 /*==================================================================================================
@@ -206,7 +204,6 @@ void normalizeNumber(const char *orig, char* dest, unsigned int destSize)
 }
 
 
-#ifndef MSG_CONTACTS_SERVICE_NOT_SUPPORTED
 /*==================================================================================================
                                      FUNCTION IMPLEMENTATION
 ==================================================================================================*/
@@ -959,7 +956,6 @@ bool checkBlockingMode(char *address, bool *pisFavorites)
        return false;
 #endif
 }
-#endif /* MSG_CONTACTS_SERVICE_NOT_SUPPORTED */
 
 int MsgContactGetMinMatchDigit()
 {

diff --git a/utils/MsgUtilStorage.cpp b/utils/MsgUtilStorage.cpp
index 942ce79..f56820e 100755 (executable)
--- a/utils/MsgUtilStorage.cpp
+++ b/utils/MsgUtilStorage.cpp
@@ -1151,12 +1151,7 @@ msg_error_t MsgStoSetConversationDisplayName(MsgDbHandler *pDbHandle, int contac
                return err;
        }
 
-       /*contacts-service is not used for gear */
-#ifndef MSG_CONTACTS_SERVICE_NOT_SUPPORTED
        int order = MsgGetContactNameOrder();
-#else /* MSG_CONTACTS_SERVICE_NOT_SUPPORTED */
-       int order = 0;
-#endif /* MSG_CONTACTS_SERVICE_NOT_SUPPORTED */
        msg_struct_s *pAddrInfo = NULL;
        MSG_ADDRESS_INFO_S *address = NULL;
 
@@ -1227,12 +1222,7 @@ msg_error_t MsgStoSetConversationDisplayName(MsgDbHandler *pDbHandle, msg_thread
 
        msg_struct_list_s addressList = {0, };
 
-       /* contacts-service is not used for gear */
-#ifndef MSG_CONTACTS_SERVICE_NOT_SUPPORTED
        int order = MsgGetContactNameOrder();
-#else /* MSG_CONTACTS_SERVICE_NOT_SUPPORTED */
-       int order = 0;
-#endif /* MSG_CONTACTS_SERVICE_NOT_SUPPORTED */
 
        msg_struct_s *pAddrInfo = NULL;
        MSG_ADDRESS_INFO_S *address = NULL;
@@ -2281,12 +2271,7 @@ msg_error_t MsgStoGetAddressList(const msg_thread_id_t threadId, msg_struct_list
        msg_error_t err = MSG_SUCCESS;
 
        /* contacts-service is not used for gear */
-#ifndef MSG_CONTACTS_SERVICE_NOT_SUPPORTED
        int order = MsgGetContactNameOrder();
-#else /* MSG_CONTACTS_SERVICE_NOT_SUPPORTED */
-       int order = 0;
-#endif /* MSG_CONTACTS_SERVICE_NOT_SUPPORTED */
-
 
        err = MsgStoGetAddressByConvId(dbHandle, threadId, order, pAddrList);