commit 2567ff09f97ccba8b074a6b88cd23b81c996cc95
author Linux Build Service Account <lnxbuild@localhost> Mon Jan 25 01:08:57 2016 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Mon Jan 25 01:08:57 2016 -0800
tree 67f1e207d38830f4e6afdbc265e6506aff98f8d8
parent 3c8fbaef40819b3e644dccf8d0bde767fe07be8d
parent 1433cc64e2cfdf01dc84d4655497caaf5ce18107

Merge "policy_hal: fix for volume burst during FM device switch" into av-userspace.lnx.1.0-dev.1.0

hal/audio_hw.c

diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index c46f419..8c729ff 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2015, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2013-2016, The Linux Foundation. All rights reserved.
  * Not a Contribution.
  *
  * Copyright (C) 2013 The Android Open Source Project
@@ -1000,7 +1000,8 @@
             out_snd_device = SND_DEVICE_NONE;
             if (in_snd_device == SND_DEVICE_NONE) {
                 audio_devices_t out_device = AUDIO_DEVICE_NONE;
-                if ((adev->active_input->source == AUDIO_SOURCE_VOICE_COMMUNICATION ||
+                if (adev->active_input &&
+                    (adev->active_input->source == AUDIO_SOURCE_VOICE_COMMUNICATION ||
                     (adev->mode == AUDIO_MODE_IN_COMMUNICATION &&
                      adev->active_input->source == AUDIO_SOURCE_MIC)) &&
                      adev->primary_output && !adev->primary_output->standby) {