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

Commit 4c62ebb6 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:... 

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

Change-Id: I26e42f27c8621bb3e7f00f84ffd2ce538c1ae17b
parents 52fb8cb5 6a6afa8f

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()

{