diff options
| author | 2023-05-19 01:44:15 +0000 | |
|---|---|---|
| committer | 2023-05-19 01:44:15 +0000 | |
| commit | cc9aa73944e7716759cb076b688a65e9201cafca (patch) | |
| tree | 6d49652d6418d76cf5842e97046ac437f7d3b4cc | |
| parent | f992c449b70f873d72dd65d0aefa98bb6d6c1025 (diff) | |
| parent | 64e5cb399cf7986b3b557eb21cce41294094b0d7 (diff) | |
Merge "Fix -Wnullable-to-nonnull-conversion error" am: e2e9d546df am: 84006802c4 am: 64e5cb399c
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2595175
Change-Id: Id4439c1549032e73c2139e1cd2432ba5d4bcc425
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | libs/binder/MemoryHeapBase.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/binder/MemoryHeapBase.cpp b/libs/binder/MemoryHeapBase.cpp index 8fe1d2bb3d..3da06ba4db 100644 --- a/libs/binder/MemoryHeapBase.cpp +++ b/libs/binder/MemoryHeapBase.cpp @@ -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)) { ALOGE("MemoryHeapBase: MemFD %s sealing with flags %x failed with error %s", name, SEAL_FLAGS, strerror(errno)); - munmap(mBase, mSize); + if (mNeedUnmap) munmap(mBase, mSize); mBase = nullptr; mSize = 0; close(fd); |