Merge "Revert "SharedMemory: mark fdsan ownership"" into main (3d57c077) · Commits · e / os / android_frameworks_base

core/java/android/os/SharedMemory.java

+8 −9

Original line number	Diff line number	Diff line
		@@ -25,8 +25,6 @@ import android.system.OsConstants;

		import dalvik.system.VMRuntime;

		import libcore.io.IoUtils;

		import java.io.Closeable;
		import java.io.FileDescriptor;
		import java.io.IOException;
		@@ -65,7 +63,7 @@ public final class SharedMemory implements Parcelable, Closeable {

		mMemoryRegistration = new MemoryRegistration(mSize);
		mCleaner = Cleaner.create(mFileDescriptor,
		new Closer(mFileDescriptor, mMemoryRegistration));
		new Closer(mFileDescriptor.getInt$(), mMemoryRegistration));
		}

		/**
		@@ -328,20 +326,21 @@ public final class SharedMemory implements Parcelable, Closeable {
		* Cleaner that closes the FD
		*/
		private static final class Closer implements Runnable {
		private FileDescriptor mFd;
		private int mFd;
		private MemoryRegistration mMemoryReference;

		private Closer(FileDescriptor fd, MemoryRegistration memoryReference) {
		private Closer(int fd, MemoryRegistration memoryReference) {
		mFd = fd;
		IoUtils.setFdOwner(mFd, this);
		mMemoryReference = memoryReference;
		}

		@Override
		public void run() {
		IoUtils.closeQuietly(mFd);
		mFd = null;

		try {
		FileDescriptor fd = new FileDescriptor();
		fd.setInt$(mFd);
		Os.close(fd);
		} catch (ErrnoException e) { /* swallow error */ }
		mMemoryReference.release();
		mMemoryReference = null;
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -87,7 +87,7 @@ public class ContentResolverTest {
		bitmap.compress(Bitmap.CompressFormat.PNG, 90, mImage.getOutputStream());

		final AssetFileDescriptor afd = new AssetFileDescriptor(
		ParcelFileDescriptor.dup(mImage.getFileDescriptor()), 0, mSize, null);
		new ParcelFileDescriptor(mImage.getFileDescriptor()), 0, mSize, null);
		when(mProvider.openTypedAssetFile(any(), any(), any(), any(), any())).thenReturn(
		afd);
		}