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

Get rid of two runtime static destructors am: 0cd8012b73 am: f1c0eeb8e9

Browse Source 
Change-Id: Ia32a920a0784b46327dd50975ae71e15fa5e8e4b
This commit is contained in:
Yurii Zubrytskyi
2020-04-10 18:04:49 +00:00
committed by Automerger Merge Worker
parent 0ec1dcbaed f1c0eeb8e9
commit b16a71692c
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 <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);

5
services/incremental/IncrementalService.cpp
View File

@@ -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;
}