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

Commit 8298d059 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Merge "Add mutual exclusion access for addOrUpdateStream and... 

Merge "Merge "Add mutual exclusion access for addOrUpdateStream and removeStream" am: af108c45 am: 760c2bcc am: bd580a07 am: 91e082a9 am: 7f6cc71f" into rvc-dev am: d32c56d2

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

Change-Id: I798ba177a5daaf4242f4934f36b437b0c681558b
parents 42c810bd d32c56d2

services/core/jni/com_android_server_tv_TvInputHal.cpp

+3 −0
Original line number Diff line number Diff line
@@ -301,6 +301,7 @@ private: 
    JTvInputHal(JNIEnv* env, jobject thiz, sp<ITvInput> tvInput, const sp<Looper>& looper);



    Mutex mLock;

    Mutex mStreamLock;

    jweak mThiz;

    sp<Looper> mLooper;
@@ -338,6 +339,7 @@ JTvInputHal* JTvInputHal::createInstance(JNIEnv* env, jobject thiz, const sp<Loo 
}



int JTvInputHal::addOrUpdateStream(int deviceId, int streamId, const sp<Surface>& surface) {

    Mutex::Autolock autoLock(&mStreamLock);

    KeyedVector<int, Connection>& connections = mConnections.editValueFor(deviceId);

    if (connections.indexOfKey(streamId) < 0) {

        connections.add(streamId, Connection());
@@ -412,6 +414,7 @@ int JTvInputHal::addOrUpdateStream(int deviceId, int streamId, const sp<Surface> 
}



int JTvInputHal::removeStream(int deviceId, int streamId) {

    Mutex::Autolock autoLock(&mStreamLock);

    KeyedVector<int, Connection>& connections = mConnections.editValueFor(deviceId);

    if (connections.indexOfKey(streamId) < 0) {

        return BAD_VALUE;