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

Commit 408dec56 authored by Alec Mouri's avatar Alec Mouri Committed by Automerger Merge Worker
Browse files

Merge "[SurfaceFlinger] Fix crash in SurfaceTracing" into rvc-dev am:... 

Merge "[SurfaceFlinger] Fix crash in SurfaceTracing" into rvc-dev am: af8d8aa5 am: edaa2946 am: 7a436ddb

Change-Id: Ie72d2ef3394326a75237e14462b26728801cee89
parents 98a0d1b5 7a436ddb

services/surfaceflinger/SurfaceTracing.cpp

+6 −1
Original line number Original line Diff line number Diff line
@@ -129,7 +129,12 @@ void SurfaceTracing::enable() { 
}

}





status_t SurfaceTracing::writeToFile() {

status_t SurfaceTracing::writeToFile() {

    mThread.join();

    std::thread thread;

    {

        std::scoped_lock lock(mTraceLock);

        thread = std::move(mThread);

    }

    thread.join();

    return mLastErr;

    return mLastErr;

}

}