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

Commit b4cab0bd authored by Brian Carlstrom's avatar Brian Carlstrom Committed by Android (Google) Code Review
Browse files

Merge "frameworks/base: Make Thread::run threadName argument required" into nyc-dev

parents 781fbf28 66f4831a

core/jni/AndroidRuntime.cpp

+1 −2
Original line number Diff line number Diff line
@@ -1184,8 +1184,7 @@ static int javaDetachThread(void) 
    void** args = (void**) malloc(3 * sizeof(void*));   // javaThreadShell must free

    int result;



    if (!threadName)

        threadName = "unnamed thread";

    LOG_ALWAYS_FATAL_IF(threadName == nullptr, "threadName not provided to javaCreateThreadEtc");



    args[0] = (void*) entryFunction;

    args[1] = userData;

services/core/jni/com_android_server_tv_TvInputHal.cpp

+1 −1
Original line number Diff line number Diff line
@@ -400,7 +400,7 @@ int JTvInputHal::addOrUpdateStream(int deviceId, int streamId, const sp<Surface> 
                connection.mThread->shutdown();

            }

            connection.mThread = new BufferProducerThread(mDevice, deviceId, &stream);

            connection.mThread->run();

            connection.mThread->run("BufferProducerThread");

        }

    }

    connection.mSurface = surface;