Merge "Revert "MemoryIntArray: don't double close."" into qt-dev

am: e7933dba63 Change-Id: I696f298fe6f3f77a418bb72dbbe38bc93dcb57bd
2019-05-13 15:53:10 -07:00
parent abd938a846 e7933dba63
commit cd40e8357a
1 changed files with 2 additions and 0 deletions
--- a/core/jni/android_util_MemoryIntArray.cpp
+++ b/core/jni/android_util_MemoryIntArray.cpp
@@ -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,