commit b9c28c72b91e464aa1155e972f74af14312191a8
author Hangyu Kuang <hkuang@google.com> Tue Jan 24 20:53:57 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jan 24 20:53:58 2017 +0000
tree 0fac251246b0c5738c6b1372401177fbd9001c07
parent e67e893d0642dd345e4d7d1cc3e76b1f0936dae8
parent 8fdb3fde346b446ad3b04dafa65a6844da672e23

Merge "media: Add back the duplication of fd inside MPEG4Writer."

media/libaudiohal/EffectBufferHalHidl.cpp

diff --git a/media/libaudiohal/EffectBufferHalHidl.cpp b/media/libaudiohal/EffectBufferHalHidl.cpp
index 446d2ef..a353461 100644
--- a/media/libaudiohal/EffectBufferHalHidl.cpp
+++ b/media/libaudiohal/EffectBufferHalHidl.cpp
@@ -80,7 +80,7 @@
                     retval = OK;
                 }
             });
-    if (retval == OK) {
+    if (result.isOk() && retval == OK) {
         mMemory = hardware::mapMemory(mHidlBuffer.data);
         if (mMemory != 0) {
             mMemory->update();
@@ -91,8 +91,10 @@
             ALOGE("Failed to map allocated ashmem");
             retval = NO_MEMORY;
         }
+    } else {
+        ALOGE("Failed to allocate %d bytes from ashmem", (int)mBufferSize);
     }
-    return retval;
+    return result.isOk() ? retval : FAILED_TRANSACTION;
 }
 
 audio_buffer_t* EffectBufferHalHidl::audioBuffer() {