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

am 08761779: am 450ff8a4: Merge change 23357 into eclair

Browse Source 
Merge commit '08761779616949b496c002bed7ce88eb909c65fc'

* commit '08761779616949b496c002bed7ce88eb909c65fc':
  Fix double-free problem in EmojiFactory.
This commit is contained in:
Daisuke Miyakawa
2009-08-31 16:46:18 -07:00
committed by Android Git Automerger
parent 9a87e50744 0876177961
commit 61e06289bb
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/jni/android_emoji_EmojiFactory.cpp
View File

@@ -197,8 +197,11 @@ static jobject android_emoji_EmojiFactory_getBitmapFromAndroidPua(
static void android_emoji_EmojiFactory_destructor(
JNIEnv* env, jobject obj, jint nativeEmojiFactory) {
/*
// Must not delete this object!!
EmojiFactory *factory = reinterpret_cast<EmojiFactory *>(nativeEmojiFactory);
delete factory;
*/
}
static jint android_emoji_EmojiFactory_getAndroidPuaFromVendorSpecificSjis(