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

Merge "Use the new radio_metadata wrapper for safer memory management." am: a9ed0b1c8b

Browse Source 
am: e163e7b943

Change-Id: I61a101f50ef6ea56b0ed9b9b1b7ec4b0516220ab
This commit is contained in:
Tomasz Wasilczyk
2017-01-27 20:38:55 +00:00
committed by android-build-merger
parent 118c0c9e7d e163e7b943
commit bb15b50ffc
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/jni/android_hardware_Radio.cpp
View File

@@ -23,7 +23,7 @@
#include "JNIHelp.h" #include "JNIHelp.h"
#include "core_jni_helpers.h" #include "core_jni_helpers.h"
#include <system/radio.h> #include <system/radio.h>
#include <system/radio_metadata.h> #include <system/RadioMetadataWrapper.h>
#include <radio/RadioCallback.h> #include <radio/RadioCallback.h>
#include <radio/Radio.h> #include <radio/Radio.h>
#include <utils/RefBase.h> #include <utils/RefBase.h>
@@ -749,7 +749,7 @@ android_hardware_Radio_getProgramInformation(JNIEnv *env, jobject thiz, jobjectA
} }
struct radio_program_info nInfo; struct radio_program_info nInfo;
radio_metadata_allocate(&nInfo.metadata, 0, 0); RadioMetadataWrapper metadataWrapper(&nInfo.metadata);
jobject jInfo = NULL; jobject jInfo = NULL;
int jStatus; int jStatus;
@@ -767,7 +767,6 @@ exit:
if (jInfo != NULL) { if (jInfo != NULL) {
env->DeleteLocalRef(jInfo); env->DeleteLocalRef(jInfo);
} }
radio_metadata_deallocate(nInfo.metadata);
return jStatus; return jStatus;
} }