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

Commit 6a6afa8f authored by Steven Moreland's avatar Steven Moreland Committed by Automerger Merge Worker
Browse files

Merge "libbinder: do not destruct SM global" am: 5921fa41 am: ad849b63 am: b4229e90 

Change-Id: I9b3f9b5f636503332538836844adb7b2243fc88a
parents 52d68a2b b4229e90

libs/binder/IServiceManager.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -85,8 +85,8 @@ private: 
    sp<AidlServiceManager> mTheRealServiceManager;

    sp<AidlServiceManager> mTheRealServiceManager;

};

};





static std::once_flag gSmOnce;

[[clang::no_destroy]] static std::once_flag gSmOnce;

static sp<IServiceManager> gDefaultServiceManager;

[[clang::no_destroy]] static sp<IServiceManager> gDefaultServiceManager;





sp<IServiceManager> defaultServiceManager()

sp<IServiceManager> defaultServiceManager()

{

{