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

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

Merge "Add mutual exclusion access for addOrUpdateStream and removeStream" am:... 

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

Original change: undetermined

Change-Id: I883a0670da87df1b29f76f64081f9c15bd18256f
parents 7ae0c438 7f6cc71f

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;