summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@android.com>2012-12-19 08:47:20 -0800
committerGerrit Code Review <noreply-gerritcodereview@google.com>2012-12-19 08:47:20 -0800
commitba97ad2a6740d5d38326c0c2ce8d5a685fab30bf (patch)
tree951c1b263981e1f23913b2ed4021e4af1d32ae23 /core
parent171a9906996675e3e9eb49fe3b3c1589417d70fb (diff)
parent8a5f9c19b65aebd1972355faf0c8bb90500c7596 (diff)
downloadframeworks_base-ba97ad2a6740d5d38326c0c2ce8d5a685fab30bf.zip
frameworks_base-ba97ad2a6740d5d38326c0c2ce8d5a685fab30bf.tar.gz
frameworks_base-ba97ad2a6740d5d38326c0c2ce8d5a685fab30bf.tar.bz2
Merge "Leak in ToneGenerator_native_setup"
Diffstat (limited to 'core')
-rw-r--r--core/jni/android_media_ToneGenerator.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/jni/android_media_ToneGenerator.cpp b/core/jni/android_media_ToneGenerator.cpp
index da6f1ed..de29b28 100644
--- a/core/jni/android_media_ToneGenerator.cpp
+++ b/core/jni/android_media_ToneGenerator.cpp
@@ -103,6 +103,7 @@ static void android_media_ToneGenerator_native_setup(JNIEnv *env, jobject thiz,
if (!lpToneGen->isInited()) {
ALOGE("ToneGenerator init failed");
jniThrowRuntimeException(env, "Init failed");
+ delete lpToneGen;
return;
}