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

Commit f4374988 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Use dupFromAidl() for sidebandStream" into udc-dev am: e61670d5 am: 5c7195a5 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23302343



Change-Id: Ia3d745fa993a2709a83ebe3f7e3d2a7996dc176c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1cd782eb 5c7195a5

services/core/jni/tvinput/JTvInputHal.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -108,7 +108,7 @@ int JTvInputHal::addOrUpdateStream(int deviceId, int streamId, const sp<Surface> 
                  status.getServiceSpecificError());

                  status.getServiceSpecificError());

            return UNKNOWN_ERROR;

            return UNKNOWN_ERROR;

        }

        }

        connection.mSourceHandle = NativeHandle::create(makeFromAidl(sidebandStream), true);

        connection.mSourceHandle = NativeHandle::create(dupFromAidl(sidebandStream), true);

    }

    }

    connection.mSurface = surface;

    connection.mSurface = surface;

    if (connection.mSurface != nullptr) {

    if (connection.mSurface != nullptr) {