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

Merge "media: Silence an analyzer complaint; clean up code"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-01-30 22:56:09 +00:00
committed by Android (Google) Code Review
parent d3f4b874b1 20d18966bc
commit 970e89459e
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/jni/android_media_AudioAttributes.cpp
View File

@@ -135,7 +135,7 @@ JNIAudioAttributeHelper::UniqueAaPtr JNIAudioAttributeHelper::makeUnique()
{
audio_attributes_t *aa = new (calloc(1, sizeof(audio_attributes_t)))
audio_attributes_t{AUDIO_ATTRIBUTES_INITIALIZER};
return UniqueAaPtr{aa, free};
return UniqueAaPtr{aa};
}
jint JNIAudioAttributeHelper::nativeFromJava(JNIEnv* env, jobject jAudioAttributes,

6
core/jni/android_media_AudioAttributes.h
View File

@@ -27,7 +27,11 @@ namespace android {
class JNIAudioAttributeHelper
{
public:
using UniqueAaPtr = std::unique_ptr<audio_attributes_t, decltype(free)*>;
struct FreeDeleter {
void operator()(void *p) const { ::free(p); }
};
using UniqueAaPtr = std::unique_ptr<audio_attributes_t, FreeDeleter>;
/**
* @brief makeUnique helper to prevent leak