summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Josh Gao <jmgao@google.com> 2018-08-14 14:59:28 -0700
committer android-build-merger <android-build-merger@google.com> 2018-08-14 14:59:28 -0700
commitbb1805ceccd3be86c20bbeb1d2304cedbf0c65d5 (patch)
treeb97f7a13ccf1d58bcb4cef032946eb98fd0a6f63
parente4086dfff6ac7c1d5dfffb2bba7b7932a50ab4dd (diff)
parent71af69dba44a7de244271ee37009ebf37077e5e2 (diff)
Merge "MemoryIntArray: don't double close." am: 9b9728710f
am: 71af69dba4 Change-Id: Ia58140ccaa33bc52cd2d2e7961d50626323f3049
-rw-r--r--core/jni/android_util_MemoryIntArray.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/core/jni/android_util_MemoryIntArray.cpp b/core/jni/android_util_MemoryIntArray.cpp
index 2dfbe3ecfef6..b68f9eca70cd 100644
--- a/core/jni/android_util_MemoryIntArray.cpp
+++ b/core/jni/android_util_MemoryIntArray.cpp
@@ -142,8 +142,6 @@ 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,