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

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

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

Change-Id: Ib230829ed00632d7f2b54885fa4b134dd52cfdd7
parents 2804e79b 5921fa41
Loading
Loading
Loading
Loading
+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()
{
{