drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 1d50879b: Merge "Remove memory leak in PersistentDataBlockService jni"

Browse Source 
* commit '1d50879b1d183d4caa15b9685515b5f959213fe9':
  Remove memory leak in PersistentDataBlockService jni
This commit is contained in:
Narayan Kamath
2015-07-01 13:44:56 +00:00
committed by Android Git Automerger
parent a1867fb044 1d50879b1d
commit bba9d27e0c
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,6 +17,7 @@
#include <android_runtime/AndroidRuntime.h> #include <android_runtime/AndroidRuntime.h>
#include <JNIHelp.h> #include <JNIHelp.h>
#include <jni.h> #include <jni.h>
#include <ScopedUtfChars.h>
#include <utils/misc.h> #include <utils/misc.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
@ -77,8 +78,8 @@ namespace android {
static jlong com_android_server_PersistentDataBlockService_getBlockDeviceSize(JNIEnv *env, jclass, jstring jpath) static jlong com_android_server_PersistentDataBlockService_getBlockDeviceSize(JNIEnv *env, jclass, jstring jpath)
{ {
const char *path = env->GetStringUTFChars(jpath, 0); ScopedUtfChars path(env, jpath);
int fd = open(path, O_RDONLY); int fd = open(path.c_str(), O_RDONLY);
if (fd < 0) if (fd < 0)
return 0; return 0;
@ -87,8 +88,8 @@ namespace android {
} }
static int com_android_server_PersistentDataBlockService_wipe(JNIEnv *env, jclass, jstring jpath) { static int com_android_server_PersistentDataBlockService_wipe(JNIEnv *env, jclass, jstring jpath) {
const char *path = env->GetStringUTFChars(jpath, 0); ScopedUtfChars path(env, jpath);
int fd = open(path, O_WRONLY); int fd = open(path.c_str(), O_WRONLY);
if (fd < 0) if (fd < 0)
return 0; return 0;