commit 2715465b9487c00fc38676494d1f9dd3ea1a15f2
author Satoshi Kataoka <satok@google.com> Wed Oct 09 21:00:13 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Oct 09 21:00:13 2013 -0700
tree d1af195c4e08432cc606fe47a8b30ced8a0d1f7d
parent 8d454af44bb000ccbbcc2e00b15856e680017596
parent 67aa1a93f8376d73511ca6d08052298326eb3b44

am 67aa1a93: am 2d3e1210: Fix memory leak in EmojiPaletteView

* commit '67aa1a93f8376d73511ca6d08052298326eb3b44':
  Fix memory leak in EmojiPaletteView

java/src/com/android/inputmethod/keyboard/EmojiPalettesView.java

diff --git a/java/src/com/android/inputmethod/keyboard/EmojiPalettesView.java b/java/src/com/android/inputmethod/keyboard/EmojiPalettesView.java
index ef9448c..5c518b8 100644
--- a/java/src/com/android/inputmethod/keyboard/EmojiPalettesView.java
+++ b/java/src/com/android/inputmethod/keyboard/EmojiPalettesView.java
@@ -694,13 +694,16 @@
         @Override
         public void destroyItem(final ViewGroup container, final int position,
                 final Object object) {
-            ScrollKeyboardView keyboardView = mActiveKeyboardViews.get(position);
+            final ScrollKeyboardView keyboardView = mActiveKeyboardViews.get(position);
             if (keyboardView != null) {
                 keyboardView.deallocateMemory();
                 mActiveKeyboardViews.remove(position);
             }
-            container.removeView(keyboardView);
-            keyboardView = null;
+            if (object instanceof View) {
+                container.removeView((View)object);
+            } else {
+                Log.w(TAG, "Warning!!! Emoji palette may be leaking. " + object);
+            }
         }
     }