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

Commit 42ac4be2 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 

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



Change-Id: I5b7c4189a56fd692ee86afa0f2b65037d938ad42
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 61f0d188 35c25d36

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