commit fd2f8d43419d1f25ced8b2bac96407925dd4c471
author Yohei Yukawa <yukawa@google.com> Fri Mar 14 03:03:08 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Mar 14 03:03:08 2014 +0000
tree 70a18c3cb5fc2c1248f85c89af69257ec6cde12e
parent a921d8b6b1a3478f258b9999ed909907216edbae
parent 51b921d0e33302b3f431dcfa15bd6588408525ea

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

* commit '51b921d0e33302b3f431dcfa15bd6588408525ea':
  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);
 }