commit 194170e7f7493c828235f325140dd860d31d077d
author Takayuki Hoshi <hoshi@google.com> Fri Sep 21 06:24:21 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Sep 21 06:24:21 2018 +0000
tree d46ffa5727617b0697cf51e5973b429d1cf0917b
parent be42bd86f7ab1690dcecf1b9f9d254e3b87160f4
parent 4237ed70b2a41b585f79f2b5d12e96193743342d

Merge "Allocate new native handle to store sidebandStream"

services/core/jni/com_android_server_tv_TvInputHal.cpp

diff --git a/services/core/jni/com_android_server_tv_TvInputHal.cpp b/services/core/jni/com_android_server_tv_TvInputHal.cpp
index 93c4829..6c2a894 100644
--- a/services/core/jni/com_android_server_tv_TvInputHal.cpp
+++ b/services/core/jni/com_android_server_tv_TvInputHal.cpp
@@ -390,7 +390,11 @@
                 [&result, &sidebandStream](Result res, const native_handle_t* handle) {
                     result = res;
                     if (res == Result::OK) {
-                        sidebandStream = handle;
+                        if (handle) {
+                            sidebandStream = native_handle_clone(handle);
+                        } else {
+                            result = Result::UNKNOWN;
+                        }
                     }
                 });
         if (result != Result::OK) {
@@ -398,7 +402,7 @@
                     result);
             return UNKNOWN_ERROR;
         }
-        connection.mSourceHandle = NativeHandle::create((native_handle_t*)sidebandStream, false);
+        connection.mSourceHandle = NativeHandle::create((native_handle_t*)sidebandStream, true);
     }
     connection.mSurface = surface;
     if (connection.mSurface != nullptr) {