commit 43bfed5430f8c0b042ad229370a9d1fe95eb6156
author Yohei Yukawa <yukawa@google.com> Fri Mar 14 22:03:03 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Mar 14 22:03:03 2014 +0000
tree 7dcc515ca53ad63b7526c560b6537e36b402ff42
parent ce805c7ce475eead0e4e3326070d7dc2983d4e70
parent c05362b84cd55f6bac20a373b74f66a79577109d

am c05362b8: am 77943308: am fd2f8d43: am 51b921d0: DO NOT MERGE - Preserve the order of InputMethodManager method calls

* commit 'c05362b84cd55f6bac20a373b74f66a79577109d':
  DO NOT MERGE - Preserve the order of InputMethodManager method calls

core/java/com/android/internal/view/IInputMethodManager.aidl

diff --git a/core/java/com/android/internal/view/IInputMethodManager.aidl b/core/java/com/android/internal/view/IInputMethodManager.aidl
index 12ced68..3724a08 100644
--- a/core/java/com/android/internal/view/IInputMethodManager.aidl
+++ b/core/java/com/android/internal/view/IInputMethodManager.aidl
@@ -73,5 +73,5 @@
     boolean switchToNextInputMethod(in IBinder token, boolean onlyCurrentIme);
     boolean shouldOfferSwitchingToNextInputMethod(in IBinder token);
     boolean setInputMethodEnabled(String id, boolean enabled);
-    oneway void setAdditionalInputMethodSubtypes(String id, in InputMethodSubtype[] subtypes);
+    void setAdditionalInputMethodSubtypes(String id, in InputMethodSubtype[] subtypes);
 }