commit b500b90b12d84dbb6f500a1f2dd247992a5e5dae
author Kevin Rocard <krocard@google.com> Tue May 02 14:59:04 2017 -0700
committer Kevin Rocard <krocard@google.com> Wed May 10 18:57:46 2017 +0000
tree 03a9f86f1335d5ee47c830917f036c39dbc2cc00
parent 48443b628f3c06605adeb08d9d2f3128e78d1d0c

HAL: Add forgotten {} after if

My previous fix to close resources on error was buggy.
The if did not have {} around the `then` statement.

Thus sndmonitor was broken.

Test: vts-tradefed run vts --module VtsHalAudioV2_0Target
Test: call/play music/record/video...
Bug: 38186481
Change-Id: I643c38c3bed76c63359348aeaccb774b64bf6f7c
Signed-off-by: Kevin Rocard <krocard@google.com>

hal/audio_extn/sndmonitor.c

diff --git a/hal/audio_extn/sndmonitor.c b/hal/audio_extn/sndmonitor.c
index f4e208c..86a5b93 100644
--- a/hal/audio_extn/sndmonitor.c
+++ b/hal/audio_extn/sndmonitor.c
@@ -190,9 +190,10 @@
         }
 
         ret = add_new_sndcard(atoi(ptr), fd);
-        if (ret != 0)
-            close(fd);
+        if (ret != 0) {
+            close(fd); // card state fd ownership is taken by sndcard on success
             continue;
+        }
 
         num_cards++;
 
@@ -219,9 +220,10 @@
             continue;
 
         ret = add_new_sndcard(CPE_MAGIC_NUM+num_cpe, fd);
-        if (ret != 0)
-            close(fd);
+        if (ret != 0) {
+            close(fd); // card state fd ownership is taken by sndcard on success
             continue;
+        }
 
         num_cpe++;
         num_cards++;