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

Commit 41f8efaa authored by Yurii Zubrytskyi's avatar Yurii Zubrytskyi Committed by Automerger Merge Worker
Browse files

Get rid of two runtime static destructors am: 0cd8012b am: f1c0eeb8 

Change-Id: I1be362dd96875692f67593b3e9050bbc75623f98
parents 3135110f f1c0eeb8

services/incremental/BinderIncrementalService.cpp

+3 −2
Original line number Diff line number Diff line
@@ -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);

services/incremental/IncrementalService.cpp

+3 −2
Original line number Diff line number Diff line
@@ -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;

}