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

Commit 829774da authored by Steven Moreland's avatar Steven Moreland Committed by Automerger Merge Worker
Browse files

Merge "libbinder: do not destruct SM global" into rvc-dev am: 63da46c3 am: 294d6c08 

Change-Id: If87187be88cba91f297c43fe5b0dee72f5885421
parents eaef2bdf 294d6c08

libs/binder/IServiceManager.cpp

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

};



static std::once_flag gSmOnce;

static sp<IServiceManager> gDefaultServiceManager;

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

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



sp<IServiceManager> defaultServiceManager()

{