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

* commit '145cac85f8ff077447d282c147e4c8865833b76a': Memory leak in IInputMethodSessionWrapper executeMessage
2013-10-29 18:31:00 -07:00
parent 81b7caf0d1 145cac85f8
commit 4c62da692c
1 changed files with 9 additions and 1 deletions
--- a/core/java/android/inputmethodservice/IInputMethodSessionWrapper.java
+++ b/core/java/android/inputmethodservice/IInputMethodSessionWrapper.java
@@ -75,7 +75,15 @@ class IInputMethodSessionWrapper extends IInputMethodSession.Stub
    @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;
        }