diff options
| author | 2023-05-19 03:58:56 +0000 | |
|---|---|---|
| committer | 2023-05-19 03:58:56 +0000 | |
| commit | 72998ae419db496bc28be899741d3952e5ea207f (patch) | |
| tree | 0161f39ea19ddab2e20136bbb8deaa703d3a7044 | |
| parent | b1c42ebdda8bc235a92a399532940fbb9ffe55f1 (diff) | |
| parent | 8a96b27cf24b13cfdb0c8a536f4fb863dc68819f (diff) | |
Merge "Fix -Wnullable-to-nonnull-conversion error" am: e2e9d546df am: 84006802c4 am: 64e5cb399c am: cc9aa73944 am: e8dcf86890 am: 8a96b27cf2
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2595175
Change-Id: I2d2281cbc3ec91cd5907d0815b77977fe0e1adee
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); |