commit a609e8ebdfeca875b6d35ccfb3fb8b87710f3499
author Eric Laurent <elaurent@google.com> Wed Jun 18 02:15:17 2014 +0000
committer Eric Laurent <elaurent@google.com> Wed Jun 18 02:15:17 2014 +0000
tree 00663eb41063f736d5bb4a8539d0f28415feaf24
parent cedf1ac3c00e331b5f51b077f26c1367544ddd65

Revert "hal: Add support for IMS calls"

This reverts commit cedf1ac3c00e331b5f51b077f26c1367544ddd65.

Change-Id: I5f92f28c8b97265263a0bce5b38ff60d4655b68b

hal/msm8960/platform.c

diff --git a/hal/msm8960/platform.c b/hal/msm8960/platform.c
index 87b18b2..ae551b9 100644
--- a/hal/msm8960/platform.c
+++ b/hal/msm8960/platform.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2014 The Android Open Source Project
+ * Copyright (C) 2013 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.
@@ -481,7 +481,7 @@
     return ret;
 }
 
-int platform_start_voice_call(void *platform, uint32_t vsid __unused)
+int platform_start_voice_call(void *platform)
 {
     struct platform_data *my_data = (struct platform_data *)platform;
     int ret = 0;
@@ -501,7 +501,7 @@
     return ret;
 }
 
-int platform_stop_voice_call(void *platform, uint32_t vsid __unused)
+int platform_stop_voice_call(void *platform)
 {
     struct platform_data *my_data = (struct platform_data *)platform;
     int ret = 0;
@@ -564,12 +564,6 @@
     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;
@@ -686,10 +680,10 @@
             ALOGE("%s: No output device set for voice call", __func__);
             goto exit;
         }
-        if (adev->voice.tty_mode != TTY_MODE_OFF) {
+        if (adev->tty_mode != TTY_MODE_OFF) {
             if (out_device & AUDIO_DEVICE_OUT_WIRED_HEADPHONE ||
                 out_device & AUDIO_DEVICE_OUT_WIRED_HEADSET) {
-                switch (adev->voice.tty_mode) {
+                switch (adev->tty_mode) {
                 case TTY_MODE_FULL:
                     snd_device = SND_DEVICE_IN_VOICE_TTY_FULL_HEADSET_MIC;
                     break;
@@ -700,7 +694,7 @@
                     snd_device = SND_DEVICE_IN_VOICE_TTY_HCO_HEADSET_MIC;
                     break;
                 default:
-                    ALOGE("%s: Invalid TTY mode (%#x)", __func__, adev->voice.tty_mode);
+                    ALOGE("%s: Invalid TTY mode (%#x)", __func__, adev->tty_mode);
                 }
                 goto exit;
             }
@@ -917,31 +911,6 @@
     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)
 {

hal/msm8960/platform.h

diff --git a/hal/msm8960/platform.h b/hal/msm8960/platform.h
index 4d137aa..a2ae80f 100644
--- a/hal/msm8960/platform.h
+++ b/hal/msm8960/platform.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2014 The Android Open Source Project
+ * Copyright (C) 2013 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.