diff options
| author | 2020-04-09 23:08:31 -0700 | |
|---|---|---|
| committer | 2020-04-10 16:49:34 +0000 | |
| commit | 0cd8012b73d45e03509a25494441704a401c7021 (patch) | |
| tree | a5a3123499c000134bc6f3787a202d690568c1a1 | |
| parent | 0081f2531060adbcfb84f6dbedf856e4a0b3ec12 (diff) | |
Get rid of two runtime static destructors
Bug: 153704006
Test: compiles
Change-Id: Icb44c2d2c1e26b13a4d03a4996bffe016a141286
| -rw-r--r-- | services/incremental/BinderIncrementalService.cpp | 5 | ||||
| -rw-r--r-- | services/incremental/IncrementalService.cpp | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/services/incremental/BinderIncrementalService.cpp b/services/incremental/BinderIncrementalService.cpp index 2dbbc5ac6806..aabc58c3a297 100644 --- a/services/incremental/BinderIncrementalService.cpp +++ b/services/incremental/BinderIncrementalService.cpp @@ -17,6 +17,7 @@ #include "BinderIncrementalService.h" #include <android-base/logging.h> +#include <android-base/no_destructor.h> #include <binder/IResultReceiver.h> #include <binder/PermissionCache.h> #include <incfs.h> @@ -93,8 +94,8 @@ BinderIncrementalService* BinderIncrementalService::start() { } status_t BinderIncrementalService::dump(int fd, const Vector<String16>&) { - static const String16 kDump("android.permission.DUMP"); - if (!PermissionCache::checkCallingPermission(kDump)) { + static const android::base::NoDestructor<String16> kDump("android.permission.DUMP"); + if (!PermissionCache::checkCallingPermission(*kDump)) { return PERMISSION_DENIED; } mImpl.onDump(fd); diff --git a/services/incremental/IncrementalService.cpp b/services/incremental/IncrementalService.cpp index 92366e51eb47..4f64cad1f9d9 100644 --- a/services/incremental/IncrementalService.cpp +++ b/services/incremental/IncrementalService.cpp @@ -20,6 +20,7 @@ #include <android-base/file.h> #include <android-base/logging.h> +#include <android-base/no_destructor.h> #include <android-base/properties.h> #include <android-base/stringprintf.h> #include <android-base/strings.h> @@ -701,8 +702,8 @@ IncrementalService::IfsMountPtr IncrementalService::getIfs(StorageId storage) co const IncrementalService::IfsMountPtr& IncrementalService::getIfsLocked(StorageId storage) const { auto it = mMounts.find(storage); if (it == mMounts.end()) { - static const IfsMountPtr kEmpty = {}; - return kEmpty; + static const android::base::NoDestructor<IfsMountPtr> kEmpty{}; + return *kEmpty; } return it->second; } |