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

* commit '67aa1a93f8376d73511ca6d08052298326eb3b44':
  Fix memory leak in EmojiPaletteView
This commit is contained in:
Satoshi Kataoka 2013-10-09 21:00:13 -07:00 committed by Android Git Automerger
commit 2715465b94

View file

@ -694,13 +694,16 @@ public final class EmojiPalettesView extends LinearLayout implements OnTabChange
@Override @Override
public void destroyItem(final ViewGroup container, final int position, public void destroyItem(final ViewGroup container, final int position,
final Object object) { final Object object) {
ScrollKeyboardView keyboardView = mActiveKeyboardViews.get(position); final ScrollKeyboardView keyboardView = mActiveKeyboardViews.get(position);
if (keyboardView != null) { if (keyboardView != null) {
keyboardView.deallocateMemory(); keyboardView.deallocateMemory();
mActiveKeyboardViews.remove(position); mActiveKeyboardViews.remove(position);
} }
container.removeView(keyboardView); if (object instanceof View) {
keyboardView = null; container.removeView((View)object);
} else {
Log.w(TAG, "Warning!!! Emoji palette may be leaking. " + object);
}
} }
} }