Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 33c4b1ef authored by Takayuki Hoshi's avatar Takayuki Hoshi Committed by android-build-merger
Browse files

Merge "Allocate new native handle to store sidebandStream" am: 194170e7 

am: 757692ae

Change-Id: Ie4d5a0fefa4e755475c385076aae13f4be5838f0
parents 2fbd86a1 757692ae

services/core/jni/com_android_server_tv_TvInputHal.cpp

+6 −2
Original line number Diff line number Diff line
@@ -390,7 +390,11 @@ int JTvInputHal::addOrUpdateStream(int deviceId, int streamId, const sp<Surface> 
                [&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 @@ int JTvInputHal::addOrUpdateStream(int deviceId, int streamId, const sp<Surface> 
                    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) {