From 5eda55f20adda211d96359cace7a9a9d8bbfa8ea Mon Sep 17 00:00:00 2001 From: "Christopher N. Hesse" Date: Tue, 21 Feb 2017 22:54:34 +0100 Subject: [PATCH] libsecril-client: Expose MSIM functions by default Recent devices (zero, noble, others) link audio-ril against this. Change-Id: If774ff378f519b221594e8b793a95831cacd4ae4 --- ril/libsecril-client/secril-client.cpp | 4 ---- ril/libsecril-client/secril-client.h | 3 +-- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/ril/libsecril-client/secril-client.cpp b/ril/libsecril-client/secril-client.cpp index ffb2494..3277b1d 100755 --- a/ril/libsecril-client/secril-client.cpp +++ b/ril/libsecril-client/secril-client.cpp @@ -36,9 +36,7 @@ namespace android { #define RILD_PORT 7777 #define MULTI_CLIENT_SOCKET_NAME "Multiclient" #define MULTI_CLIENT_Q_SOCKET_NAME "QMulticlient" -#if defined(SEC_PRODUCT_FEATURE_RIL_CALL_DUALMODE_CDMAGSM) #define MULTI_CLIENT_SOCKET_NAME_2 "Multiclient2" -#endif #define MAX_COMMAND_BYTES (8 * 1024) #define REQ_POOL_SIZE 32 @@ -470,7 +468,6 @@ int Connect_QRILD(HRilClient client) { return RIL_CLIENT_ERR_SUCCESS; } -#if defined(SEC_PRODUCT_FEATURE_RIL_CALL_DUALMODE_CDMAGSM) // mook_120209 Enable multiclient /** * @fn int Connect_RILD_Second(void) * @@ -534,7 +531,6 @@ int Connect_RILD_Second(HRilClient client) { return RIL_CLIENT_ERR_SUCCESS; } -#endif /** * @fn int isConnected_RILD(HRilClient client) diff --git a/ril/libsecril-client/secril-client.h b/ril/libsecril-client/secril-client.h index 0e82cde..4c4c2b0 100755 --- a/ril/libsecril-client/secril-client.h +++ b/ril/libsecril-client/secril-client.h @@ -75,13 +75,12 @@ int Connect_RILD(HRilClient client); */ int Connect_QRILD(HRilClient client); -#if defined(SEC_PRODUCT_FEATURE_RIL_CALL_DUALMODE_CDMAGSM) /** * Connect to RIL deamon. One client task starts. * Return is 0 or error code. */ int Connect_RILD_Second(HRilClient client); -#endif + /** * check whether RILD is connected * Returns 0 or 1 -- 2.20.1