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

Commit 5a5f55a4 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

Change-Id: Id03abaad4897bda4ea6f2e6a536b239e91a20533
parents 56ad2c4b 63da46c3
Loading
Loading
Loading
Loading
+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()
{