commit d097c9323c89c2a1bafdd59ebf57989f3009cf9a
author Amy Zhang <amyjojo@google.com> Mon Mar 08 18:33:34 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Mar 08 18:33:34 2021 +0000
tree 39e9f0191c3374897f852aed6f8342db303e0a2e
parent 64386ca848ad42830a62b43965859a3b28b88ec3
parent d7ce9e5b1795eaa7d689b83994cdd3d05ad6991a

Merge "Add missing return in Tuner default impl getAvSharedHandle after hidl_cb" into sc-dev

tv/tuner/1.1/default/Filter.cpp

diff --git a/tv/tuner/1.1/default/Filter.cpp b/tv/tuner/1.1/default/Filter.cpp
index aec1fd0..5ddac99 100644
--- a/tv/tuner/1.1/default/Filter.cpp
+++ b/tv/tuner/1.1/default/Filter.cpp
@@ -259,11 +259,14 @@
     int av_fd = createAvIonFd(BUFFER_SIZE_16M);
     if (av_fd == -1) {
         _hidl_cb(Result::UNKNOWN_ERROR, NULL, 0);
+        return Void();
     }
 
     native_handle_t* nativeHandle = createNativeHandle(av_fd);
     if (nativeHandle == NULL) {
+        ::close(av_fd);
         _hidl_cb(Result::UNKNOWN_ERROR, NULL, 0);
+        return Void();
     }
     mSharedAvMemHandle.setTo(nativeHandle, /*shouldOwn=*/true);
     ::close(av_fd);