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

Commit 84006802 authored by Zijun Zhao's avatar Zijun Zhao Committed by Automerger Merge Worker
Browse files

Merge "Fix -Wnullable-to-nonnull-conversion error" am: e2e9d546 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2595175



Change-Id: I63a514d9543802b983410eb53cd27bffd26cccc4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fd133c02 e2e9d546

libs/binder/MemoryHeapBase.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -78,7 +78,7 @@ MemoryHeapBase::MemoryHeapBase(size_t size, uint32_t flags, char const * name) 
        if (SEAL_FLAGS && (fcntl(fd, F_ADD_SEALS, SEAL_FLAGS) == -1)) {

        if (SEAL_FLAGS && (fcntl(fd, F_ADD_SEALS, SEAL_FLAGS) == -1)) {

            ALOGE("MemoryHeapBase: MemFD %s sealing with flags %x failed with error  %s", name,

            ALOGE("MemoryHeapBase: MemFD %s sealing with flags %x failed with error  %s", name,

                  SEAL_FLAGS, strerror(errno));

                  SEAL_FLAGS, strerror(errno));

            munmap(mBase, mSize);

            if (mNeedUnmap) munmap(mBase, mSize);

            mBase = nullptr;

            mBase = nullptr;

            mSize = 0;

            mSize = 0;

            close(fd);

            close(fd);