commit b368bb20a38d30e9d54863b2041fd5ed162da19a
author Narayan Kamath <narayan@google.com> Mon Feb 01 11:42:45 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Feb 01 11:42:45 2016 +0000
tree 74200067ff23cfcc757d43212b35bb381fc77bdd
parent 1c008de8db85eb6b2dfdcbbea562ef7b9da997ff
parent 8e5a0d7da7f6df2c10d752b526a50ed4f5ade3fe

Merge "close file in PersistentDataBlockService jni" am: c71c44a524
am: 8e5a0d7da7

* commit '8e5a0d7da7f6df2c10d752b526a50ed4f5ade3fe':
  close file in PersistentDataBlockService jni

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[] = {