commit 945e33a97680256140cd538939dd76a1ff559799
author Linux Build Service Account <lnxbuild@localhost> Mon Jul 09 19:17:37 2018 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Mon Jul 09 19:17:37 2018 -0700
tree 9a403a556517a0530723d57878022fbc1c534db7
parent 30ebb70f2e38fa1d83c29a6c8303c7dcaf190c02
parent bbfa5f7b4c8a0023b63980c1a738444b55fa8d9f

Merge "hal: add NULL check for active input stream"

hal/audio_hw.c

diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index f07a3ce..34a9937 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -2275,7 +2275,8 @@
 
     /* If input stream is already running then effect needs to be
        applied on the new input device that's being enabled here.  */
-    if ((in_snd_device != SND_DEVICE_NONE) && (!adev->active_input->standby))
+    if ((in_snd_device != SND_DEVICE_NONE) && (adev->active_input != NULL) &&
+        (!adev->active_input->standby))
         check_and_enable_effect(adev);
 
     if (usecase->type == VOICE_CALL || usecase->type == VOIP_CALL) {