commit c0ee18db73bd2339c299dd76277e11d59a52996f
author Vineeta Srivastava <vsrivastava@google.com> Wed Aug 03 19:30:09 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Aug 03 19:30:09 2016 +0000
tree 705d84fcfa0d7858056e4cdfb06aacfd3d80a795
parent 3c4b4e0089128adc016df43ef07c3eedef27fa28
parent 6ed310d17948110d33b5b2efe09f58dc4b04fb9f

Revert "hal: voice: fix no sound issue in voice call"
am: 6ed310d179

Change-Id: I9aa83a97cf8a028343d0452467ed703d2c134ab9

hal/audio_hw.c

diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index 1a77278..a96a509 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -1098,10 +1098,16 @@
         in->pcm = NULL;
         goto error_open;
     }
-    register_in_stream(in);
     if (in->realtime) {
         ret = pcm_start(in->pcm);
+        if (ret < 0) {
+            ALOGE("%s: RT pcm_start failed ret %d", __func__, ret);
+            pcm_close(in->pcm);
+            in->pcm = NULL;
+            goto error_open;
+        }
     }
+    register_in_stream(in);
     audio_extn_perf_lock_release();
     ALOGV("%s: exit", __func__);
 
@@ -1503,10 +1509,16 @@
             adev->offload_effects_start_output(out->handle, out->pcm_device_id);
     }
     ret = 0;
-    register_out_stream(out);
     if (out->realtime) {
         ret = pcm_start(out->pcm);
+        if (ret < 0) {
+            ALOGE("%s: RT pcm_start failed ret %d", __func__, ret);
+            pcm_close(out->pcm);
+            out->pcm = NULL;
+            goto error_open;
+        }
     }
+    register_out_stream(out);
     audio_extn_perf_lock_release();
     ALOGV("%s: exit", __func__);
     return ret;

post_proc/Android.mk

diff --git a/post_proc/Android.mk b/post_proc/Android.mk
index 59ee105..83f6a49 100644
--- a/post_proc/Android.mk
+++ b/post_proc/Android.mk
@@ -1,4 +1,4 @@
-ifneq ($(filter msm8974 msm8226 msm8084 msm8992 msm8994 msm8996,$(TARGET_BOARD_PLATFORM)),)
+ifneq ($(filter msm8974 msm8226 msm8084 msm8992 msm8994 msm8996 msm8909,$(TARGET_BOARD_PLATFORM)),)
 
 LOCAL_PATH:= $(call my-dir)
 
@@ -33,7 +33,7 @@
 
 ################################################################################
 
-ifneq ($(filter msm8992 msm8994 msm8996,$(TARGET_BOARD_PLATFORM)),)
+ifneq ($(filter msm8992 msm8994 msm8996 msm8909,$(TARGET_BOARD_PLATFORM)),)
 
 include $(CLEAR_VARS)