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

Commit 60809c9f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "libhwui: AnimatedImageThread fix 'UAF' nits" into sc-dev am: 5ee1270c am: 1fed227c 

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

Change-Id: Idc8f7c159be03c32d121a5dcaabce90df77be64c
parents c5bdffc0 1fed227c

libs/hwui/hwui/AnimatedImageThread.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -22,12 +22,12 @@ namespace android { 
namespace uirenderer {

namespace uirenderer {





AnimatedImageThread& AnimatedImageThread::getInstance() {

AnimatedImageThread& AnimatedImageThread::getInstance() {

    [[clang::no_destroy]] static sp<AnimatedImageThread> sInstance = []() {

    static sp<AnimatedImageThread> sInstance = []() {

        sp<AnimatedImageThread> thread = sp<AnimatedImageThread>::make();

        sp<AnimatedImageThread> thread = sp<AnimatedImageThread>::make();

        thread->start("AnimatedImageThread");

        thread->start("AnimatedImageThread");

        return thread;

        return thread;

    }();

    }();

    return *sInstance.get();

    return *sInstance;

}

}





AnimatedImageThread::AnimatedImageThread() {

AnimatedImageThread::AnimatedImageThread() {