commit 9427510d0f95d8e5c3595bc7d82017b02d1451fa
author Andreas Schneider <asn@cryptomilk.org> Mon Aug 24 19:55:42 2015 +0200
committer Andreas Schneider <asn@cryptomilk.org> Tue Aug 25 15:43:36 2015 +0200
tree 52c06417671861dfec108363f2216d34f53823e9
parent 7bf409edb0e3d78eaaab972467298a2cf4ee116c

libsecril-client: Fix SetCallAudioPath for current devices

Change-Id: I38f10432f8e9a257af3e74312616d07698edd20f
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>

ril/libsecril-client/Android.mk

diff --git a/ril/libsecril-client/Android.mk b/ril/libsecril-client/Android.mk
index 95e787d..df9ee57 100755
--- a/ril/libsecril-client/Android.mk
+++ b/ril/libsecril-client/Android.mk
@@ -15,8 +15,8 @@
 
 LOCAL_CFLAGS := 
 
-ifeq ($(BOARD_MODEM_TYPE),xmm7260)
-LOCAL_CFLAGS += -DMODEM_TYPE_XMM7260
+ifeq ($(TARGET_BOARD_PLATFORM),exynos4)
+LOCAL_CFLAGS += -DRIL_CALL_AUIO_PATH_EXTRAVOLUME
 endif
 
 LOCAL_MODULE:= libsecril-client

ril/libsecril-client/secril-client.cpp

diff --git a/ril/libsecril-client/secril-client.cpp b/ril/libsecril-client/secril-client.cpp
index 61f046d..9351f7a 100755
--- a/ril/libsecril-client/secril-client.cpp
+++ b/ril/libsecril-client/secril-client.cpp
@@ -668,7 +668,12 @@
  * Set external sound device path for noise reduction.
  */
 extern "C"
-int SetCallAudioPath(HRilClient client, AudioPath path, ExtraVolume mode) {
+#ifdef RIL_CALL_AUIO_PATH_EXTRAVOLUME
+int SetCallAudioPath(HRilClient client, AudioPath path, ExtraVolume mode)
+#else
+int SetCallAudioPath(HRilClient client, AudioPath path)
+#endif
+{
     RilClientPrv *client_prv;
     int ret;
     char data[6] = {0,};
@@ -696,7 +701,9 @@
     data[2] = 0x00;     // data length
     data[3] = 0x06;     // data length
     data[4] = ConvertAudioPath(path); // audio path
+#ifdef RIL_CALL_AUIO_PATH_EXTRAVOLUME
     data[5] = mode; // ExtraVolume
+#endif
 
     RegisterRequestCompleteHandler(client, REQ_SET_AUDIO_PATH, NULL);
 

ril/libsecril-client/secril-client.h

diff --git a/ril/libsecril-client/secril-client.h b/ril/libsecril-client/secril-client.h
index fb1729c..134b80e 100755
--- a/ril/libsecril-client/secril-client.h
+++ b/ril/libsecril-client/secril-client.h
@@ -154,10 +154,12 @@
 /**
  * ExtraVolume
  */
+#ifdef RIL_CALL_AUIO_PATH_EXTRAVOLUME
 typedef enum _ExtraVolume {
     ORIGINAL_PATH,
     EXTRA_VOLUME_PATH
 } ExtraVolume;
+#endif
 
 /**
  * Clock adjustment parameters.
@@ -244,7 +246,11 @@
 /**
  * Set external sound device path for noise reduction.
  */
+#ifdef RIL_CALL_AUIO_PATH_EXTRAVOLUME
 int SetCallAudioPath(HRilClient client, AudioPath path, ExtraVolume mode);
+#else
+int SetCallAudioPath(HRilClient client, AudioPath path);
+#endif
 
 /**
  * Set modem clock to master or slave.