Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Get rid of two runtime static destructors

Browse Source 
Bug: 153704006
Test: compiles
Change-Id: Icb44c2d2c1e26b13a4d03a4996bffe016a141286
This commit is contained in:
Yurii Zubrytskyi
2020-04-09 23:08:31 -07:00
parent 0081f25310
commit 0cd8012b73
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/incremental/BinderIncrementalService.cpp
View File

@@ -17,6 +17,7 @@
#include "BinderIncrementalService.h" #include "BinderIncrementalService.h"
#include <android-base/logging.h> #include <android-base/logging.h>
#include <android-base/no_destructor.h>
#include <binder/IResultReceiver.h> #include <binder/IResultReceiver.h>
#include <binder/PermissionCache.h> #include <binder/PermissionCache.h>
#include <incfs.h> #include <incfs.h>
@@ -93,8 +94,8 @@ BinderIncrementalService* BinderIncrementalService::start() {
} }
status_t BinderIncrementalService::dump(int fd, const Vector<String16>&) { status_t BinderIncrementalService::dump(int fd, const Vector<String16>&) {
static const String16 kDump("android.permission.DUMP"); static const android::base::NoDestructor<String16> kDump("android.permission.DUMP");
if (!PermissionCache::checkCallingPermission(kDump)) { if (!PermissionCache::checkCallingPermission(*kDump)) {
return PERMISSION_DENIED; return PERMISSION_DENIED;
} }
mImpl.onDump(fd); mImpl.onDump(fd);

5
services/incremental/IncrementalService.cpp
View File

@@ -20,6 +20,7 @@
#include <android-base/file.h> #include <android-base/file.h>
#include <android-base/logging.h> #include <android-base/logging.h>
#include <android-base/no_destructor.h>
#include <android-base/properties.h> #include <android-base/properties.h>
#include <android-base/stringprintf.h> #include <android-base/stringprintf.h>
#include <android-base/strings.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 { const IncrementalService::IfsMountPtr& IncrementalService::getIfsLocked(StorageId storage) const {
auto it = mMounts.find(storage); auto it = mMounts.find(storage);
if (it == mMounts.end()) { if (it == mMounts.end()) {
static const IfsMountPtr kEmpty = {}; static const android::base::NoDestructor<IfsMountPtr> kEmpty{};
return kEmpty; return *kEmpty;
} }
return it->second; return it->second;
} }