commit 4c62da692ce5159a187644ca76f7de2063bbf057
author Jeff Brown <jeffbrown@android.com> Tue Oct 29 18:31:00 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Oct 29 18:31:00 2013 -0700
tree 7cab01a0c3558c9260e780b68fb22637bc91944b
parent 81b7caf0d12fb56ab40592467d6b1cbcaef8f0b4
parent 145cac85f8ff077447d282c147e4c8865833b76a

am 145cac85: am 4bf6eb17: Merge "Memory leak in IInputMethodSessionWrapper executeMessage"

* commit '145cac85f8ff077447d282c147e4c8865833b76a':
  Memory leak in IInputMethodSessionWrapper executeMessage

core/java/android/inputmethodservice/IInputMethodSessionWrapper.java

diff --git a/core/java/android/inputmethodservice/IInputMethodSessionWrapper.java b/core/java/android/inputmethodservice/IInputMethodSessionWrapper.java
index 726dcec..bbea8ff 100644
--- a/core/java/android/inputmethodservice/IInputMethodSessionWrapper.java
+++ b/core/java/android/inputmethodservice/IInputMethodSessionWrapper.java
@@ -75,7 +75,15 @@
     @Override
     public void executeMessage(Message msg) {
         if (mInputMethodSession == null) {
-            // The session has been finished.
+            // The session has been finished. Args needs to be recycled
+            // for cases below.
+            switch (msg.what) {
+                case DO_UPDATE_SELECTION:
+                case DO_APP_PRIVATE_COMMAND: {
+                    SomeArgs args = (SomeArgs)msg.obj;
+                    args.recycle();
+                }
+            }
             return;
         }