From 58f8eb7ae0ee400585bce6682a7212575115e758 Mon Sep 17 00:00:00 2001 From: Eric Laurent Date: Fri, 12 Sep 2014 16:19:41 -0700 Subject: [PATCH] audio policy: fix check in creaateAudioPatch() Bug: 17488759. Change-Id: I9dd2c3ca7f83de4b3573f4fb0e9934e1bc37c3bc --- services/audiopolicy/AudioPolicyManager.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/services/audiopolicy/AudioPolicyManager.cpp b/services/audiopolicy/AudioPolicyManager.cpp index 22c4e04556..abdbc5c0c0 100644 --- a/services/audiopolicy/AudioPolicyManager.cpp +++ b/services/audiopolicy/AudioPolicyManager.cpp @@ -2294,14 +2294,14 @@ status_t AudioPolicyManager::createAudioPatch(const struct audio_patch *patch, } sp srcDeviceDesc = mAvailableInputDevices.getDeviceFromId(patch->sources[0].id); + if (srcDeviceDesc == 0) { + return BAD_VALUE; + } //update source and sink with our own data as the data passed in the patch may // be incomplete. struct audio_patch newPatch = *patch; srcDeviceDesc->toAudioPortConfig(&newPatch.sources[0], &patch->sources[0]); - if (srcDeviceDesc == 0) { - return BAD_VALUE; - } for (size_t i = 0; i < patch->num_sinks; i++) { if (patch->sinks[i].type != AUDIO_PORT_TYPE_DEVICE) { -- 2.11.0