Merge change 23357 into eclair

* changes: Fix double-free problem in EmojiFactory.
2009-08-31 16:33:10 -07:00
parent 6896aef0bd c81c43991c
commit 450ff8a48c
1 changed files with 3 additions and 0 deletions
--- a/core/jni/android_emoji_EmojiFactory.cpp
+++ b/core/jni/android_emoji_EmojiFactory.cpp
@@ -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(