commit 5c74bb313fbe3fb479f9dc4296e46e9586faf946
author Lianwei Wang <lianwei.wang@gmail.com> Wed Jan 13 18:42:35 2016 -0800
committer Narayan Kamath <narayan@google.com> Mon Feb 01 11:31:12 2016 +0000
tree b7ac918d51396c5d900e8608947cedbed4e469f9
parent c76789d35a7ca92c0b334cc6cf4a44a0044b2a44

close file in PersistentDataBlockService jni

The opened file should be closed.

Change-Id: I8a43b338c5c9eb0a5b1b5329eec767c6395bc7eb
Signed-off-by: Lianwei Wang <lianwei.wang@gmail.com>

services/core/jni/com_android_server_PersistentDataBlockService.cpp

diff --git a/services/core/jni/com_android_server_PersistentDataBlockService.cpp b/services/core/jni/com_android_server_PersistentDataBlockService.cpp
index 06de592..f94e5d9 100644
--- a/services/core/jni/com_android_server_PersistentDataBlockService.cpp
+++ b/services/core/jni/com_android_server_PersistentDataBlockService.cpp
@@ -84,7 +84,11 @@
         if (fd < 0)
             return 0;
 
-        return get_block_device_size(fd);
+        const uint64_t size = get_block_device_size(fd);
+
+        close(fd);
+
+        return size;
     }
 
     static int com_android_server_PersistentDataBlockService_wipe(JNIEnv *env, jclass, jstring jpath) {
@@ -94,7 +98,11 @@
         if (fd < 0)
             return 0;
 
-        return wipe_block_device(fd);
+        const int ret = wipe_block_device(fd);
+
+        close(fd);
+
+        return ret;
     }
 
     static const JNINativeMethod sMethods[] = {