Revert "Revert "hal: Add support for IMS calls""
This reverts commit a609e8ebdfeca875b6d35ccfb3fb8b87710f3499.
diff --git a/hal/msm8960/platform.c b/hal/msm8960/platform.c
index ef804d2..a0821b6 100644
--- a/hal/msm8960/platform.c
+++ b/hal/msm8960/platform.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2013 The Android Open Source Project
+ * Copyright (C) 2013-2014 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -482,7 +482,7 @@
return ret;
}
-int platform_start_voice_call(void *platform)
+int platform_start_voice_call(void *platform, uint32_t vsid __unused)
{
struct platform_data *my_data = (struct platform_data *)platform;
int ret = 0;
@@ -502,7 +502,7 @@
return ret;
}
-int platform_stop_voice_call(void *platform)
+int platform_stop_voice_call(void *platform, uint32_t vsid __unused)
{
struct platform_data *my_data = (struct platform_data *)platform;
int ret = 0;
@@ -565,6 +565,12 @@
return ret;
}
+int platform_set_device_mute(void *platform __unused, bool state __unused, char *dir __unused)
+{
+ LOGE("%s: Not implemented", __func__);
+ return -ENOSYS;
+}
+
snd_device_t platform_get_output_snd_device(void *platform, audio_devices_t devices)
{
struct platform_data *my_data = (struct platform_data *)platform;
@@ -681,10 +687,10 @@
ALOGE("%s: No output device set for voice call", __func__);
goto exit;
}
- if (adev->tty_mode != TTY_MODE_OFF) {
+ if (adev->voice.tty_mode != TTY_MODE_OFF) {
if (out_device & AUDIO_DEVICE_OUT_WIRED_HEADPHONE ||
out_device & AUDIO_DEVICE_OUT_WIRED_HEADSET) {
- switch (adev->tty_mode) {
+ switch (adev->voice.tty_mode) {
case TTY_MODE_FULL:
snd_device = SND_DEVICE_IN_VOICE_TTY_FULL_HEADSET_MIC;
break;
@@ -695,7 +701,7 @@
snd_device = SND_DEVICE_IN_VOICE_TTY_HCO_HEADSET_MIC;
break;
default:
- ALOGE("%s: Invalid TTY mode (%#x)", __func__, adev->tty_mode);
+ ALOGE("%s: Invalid TTY mode (%#x)", __func__, adev->voice.tty_mode);
}
goto exit;
}
@@ -912,6 +918,31 @@
return max_channels;
}
+int platform_set_incall_recording_session_id(void *platform __unused,
+ uint32_t session_id __unused, int rec_mode __unused)
+{
+ LOGE("%s: Not implemented", __func__);
+ return -ENOSYS;
+}
+
+int platform_stop_incall_recording_usecase(void *platform __unused)
+{
+ LOGE("%s: Not implemented", __func__);
+ return -ENOSYS;
+}
+
+int platform_start_incall_music_usecase(void *platform __unused)
+{
+ LOGE("%s: Not implemented", __func__);
+ return -ENOSYS;
+}
+
+int platform_stop_incall_music_usecase(void *platform __unused)
+{
+ LOGE("%s: Not implemented", __func__);
+ return -ENOSYS;
+}
+
/* Delay in Us */
int64_t platform_render_latency(audio_usecase_t usecase)
{