commit 32bdb7f41fd72d22ece39afb76160d618524b8b7
author gitbuildkicker <android-build@google.com> Tue Aug 09 11:16:20 2016 -0700
committer gitbuildkicker <android-build@google.com> Tue Aug 09 11:16:20 2016 -0700
tree fb50db98e12c58353074249c0351494da421bdaa
parent 012b02b8ed083d515f33ecb49c20d98a50045d60
parent 919e004f2dae1d72f24aafe2e2e1f30d7530c890

merge in nyc-dr1-release history after reset to nyc-mr1-dev

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;