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

Commit ffb032ee authored by Colin Cross's avatar Colin Cross Committed by Automerger Merge Worker
Browse files

Merge "Fix memory leak of FileDescriptorInfo object." into main am: 35c25d36 am: 42ac4be2 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2654063



Change-Id: I2da16d3798bf84686e20b5c14ee51779e3510c6d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents eea99a3d 42ac4be2

core/jni/fd_utils.cpp

+1 −0
Original line number Diff line number Diff line
@@ -580,6 +580,7 @@ void FileDescriptorTable::RestatInternal(std::set<int>& open_fds, fail_fn_t fail 
      // TODO(narayan): This will be an error in a future android release.

      // error = true;

      // ALOGW("Zygote closed file descriptor %d.", it->first);

      delete it->second;

      it = open_fd_map_.erase(it);

    } else {

      // The entry from the file descriptor table is still open. Restat