Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "close file in PersistentDataBlockService jni" am: c71c44a524

Browse Source 
am: 8e5a0d7da7

* commit '8e5a0d7da7f6df2c10d752b526a50ed4f5ade3fe':
  close file in PersistentDataBlockService jni
This commit is contained in:
Narayan Kamath
2016-02-01 11:42:45 +00:00
committed by android-build-merger
parent 1c008de8db 8e5a0d7da7
commit b368bb20a3
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/core/jni/com_android_server_PersistentDataBlockService.cpp
View File

@@ -84,7 +84,11 @@ namespace android {
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 @@ namespace android {
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[] = {