summaryrefslogtreecommitdiffstats
path: root/core/java/android/inputmethodservice
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@android.com>2013-10-29 18:32:32 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-10-29 18:32:32 -0700
commitc762ac24dea72613275779c1f869ad7c22962262 (patch)
tree379e5a325d67a779ebab9c0540a8dc50e2f2fb79 /core/java/android/inputmethodservice
parentaa2f9f01fa820ba93eaff8916b74cbc4a2bf0254 (diff)
parent4c62da692ce5159a187644ca76f7de2063bbf057 (diff)
downloadframeworks_base-c762ac24dea72613275779c1f869ad7c22962262.zip
frameworks_base-c762ac24dea72613275779c1f869ad7c22962262.tar.gz
frameworks_base-c762ac24dea72613275779c1f869ad7c22962262.tar.bz2
am 4c62da69: am 145cac85: am 4bf6eb17: Merge "Memory leak in IInputMethodSessionWrapper executeMessage"
* commit '4c62da692ce5159a187644ca76f7de2063bbf057': Memory leak in IInputMethodSessionWrapper executeMessage
Diffstat (limited to 'core/java/android/inputmethodservice')
-rw-r--r--core/java/android/inputmethodservice/IInputMethodSessionWrapper.java10
1 files changed, 9 insertions, 1 deletions
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 @@ 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;
}