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

Commit 3cc417fd authored by Wonsik Kim's avatar Wonsik Kim Committed by Automerger Merge Worker
Browse files

Merge "Use android::base::NoDestructor for static variables" am: c8f3f146 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2412183



Change-Id: If1e8e2b36b7b062ffec9dd52382b2bed631c9548
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 36e02902 c8f3f146

media/codec2/sfplugin/Codec2Buffer.cpp

+3 −2
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 


#include <aidl/android/hardware/graphics/common/Cta861_3.h>

#include <aidl/android/hardware/graphics/common/Smpte2086.h>

#include <android-base/no_destructor.h>

#include <android-base/properties.h>

#include <android/hardware/cas/native/1.0/types.h>

#include <android/hardware/drm/1.0/types.h>
@@ -1018,8 +1019,8 @@ using IMapper4 = ::android::hardware::graphics::mapper::V4_0::IMapper; 
namespace {



sp<IMapper4> GetMapper4() {

    static sp<IMapper4> sMapper = IMapper4::getService();

    return sMapper;

    static ::android::base::NoDestructor<sp<IMapper4>> sMapper(IMapper4::getService());

    return *sMapper;

}



class Gralloc4Buffer {