Commit 4cd7c896 authored May 03, 2019 by Svet Ganov Committed by Svetoslav Ganov May 10, 2019

Revert "MemoryIntArray: don't double close."

The reverted change causes a regression where we can get an IllegalStateException
during finalization as we are adopting the native fd in a ParcelFileDescriptor
which takes ownership of the fd. However, the order of finalization is undefined
and if the ParcelFileDescriptor is finalized before the MemoryIntArray we would
get an exception when running the finalization of the latter.

This reverts commit 89dfbfa2.

bug:124056170

parent db2d5357

core/jni/android_util_MemoryIntArray.cpp

+2 −0

Original line number	Diff line number	Diff line
		@@ -142,6 +142,8 @@ static void android_util_MemoryIntArray_close(JNIEnv* env, jobject clazz, jint f
		jniThrowException(env, "java/io/IOException", "ashmem unpinning failed");
		return;
		}

		close(fd);
		}

		static jint android_util_MemoryIntArray_get(JNIEnv* env, jobject clazz,