Revert "i9500: audio: Fix the audio path prototype to match libsecril-client.so."

This reverts commit 277795e3c5810c7e6051420239c3b7538247f9de.

Change-Id: I783f43bc56336046f0676820d3023496f1ba0efa

3 files changed, 5 insertions, 16 deletions

diff --git a/audio/audio_hw.c b/audio/audio_hw.c
index dcd9da0..fb03984 100644
--- a/audio/audio_hw.c
+++ b/audio/audio_hw.c
@@ -707,9 +707,7 @@ static void adev_set_call_audio_path(struct audio_device *adev)
     }
 
     ALOGV("%s: ril_set_call_audio_path(%d)", __func__, device_type);
-
-    /* TODO: Figure out which devices need EXTRA_VOLUME_PATH set */
-    ril_set_call_audio_path(&adev->ril, device_type, ORIGINAL_PATH);
+    ril_set_call_audio_path(&adev->ril, device_type);
 }
 
 /* Helper functions */
diff --git a/audio/ril_interface.c b/audio/ril_interface.c
index 12860d6..4f0110a 100644
--- a/audio/ril_interface.c
+++ b/audio/ril_interface.c
@@ -35,7 +35,7 @@ int (*_ril_connect)(void *);
 int (*_ril_is_connected)(void *);
 int (*_ril_disconnect)(void *);
 int (*_ril_set_call_volume)(void *, enum ril_sound_type, int);
-int (*_ril_set_call_audio_path)(void *, enum ril_audio_path, int);
+int (*_ril_set_call_audio_path)(void *, enum ril_audio_path);
 int (*_ril_set_call_clock_sync)(void *, enum ril_clock_state);
 int (*_ril_set_mute)(void *, int);
 int (*_ril_set_two_mic_control)(void *, enum ril_two_mic_device, enum ril_two_mic_state);
@@ -170,14 +170,12 @@ int ril_set_call_volume(struct ril_handle *ril, enum ril_sound_type sound_type,
                                 (int)(volume * ril->volume_steps_max));
 }
 
-int ril_set_call_audio_path(struct ril_handle *ril,
-                            enum ril_audio_path path,
-                            enum ril_extra_volume mode)
+int ril_set_call_audio_path(struct ril_handle *ril, enum ril_audio_path path)
 {
     if (ril_connect_if_required(ril))
         return 0;
 
-    return _ril_set_call_audio_path(ril->client, path, mode);
+    return _ril_set_call_audio_path(ril->client, path);
 }
 
 int ril_set_call_clock_sync(struct ril_handle *ril, enum ril_clock_state state)
diff --git a/audio/ril_interface.h b/audio/ril_interface.h
index f2ab9a8..e8432e1 100644
--- a/audio/ril_interface.h
+++ b/audio/ril_interface.h
@@ -60,11 +60,6 @@ enum ril_audio_path {
     SOUND_AUDIO_PATH_BLUETOOTH_WB_NO_NR
 };
 
-enum ril_extra_volume {
-    ORIGINAL_PATH,
-    EXTRA_VOLUME_PATH
-};
-
 enum ril_clock_state {
     SOUND_CLOCK_STOP,
     SOUND_CLOCK_START
@@ -94,9 +89,7 @@ int ril_open(struct ril_handle *ril);
 int ril_close(struct ril_handle *ril);
 int ril_set_call_volume(struct ril_handle *ril, enum ril_sound_type sound_type,
                         float volume);
-int ril_set_call_audio_path(struct ril_handle *ril,
-                            enum ril_audio_path path,
-                            enum ril_extra_volume mode);
+int ril_set_call_audio_path(struct ril_handle *ril, enum ril_audio_path path);
 int ril_set_call_clock_sync(struct ril_handle *ril, enum ril_clock_state state);
 int ril_set_mute(struct ril_handle *ril, enum ril_mute_state state);
 void ril_register_set_wb_amr_callback(void *function, void *data);