summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYohei Yukawa <yukawa@google.com>2014-03-14 19:00:17 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-14 19:00:17 +0000
commitdaf27b85f1877c5a802abe7362a0490f89c25ae5 (patch)
tree49ead9d8a4e1e46ec20924e5fd9c155e1b6e3447
parente04170029d99f574bed93cb7abd9f3ff41bbbd67 (diff)
parentfd2f8d43419d1f25ced8b2bac96407925dd4c471 (diff)
downloadframeworks_base-daf27b85f1877c5a802abe7362a0490f89c25ae5.zip
frameworks_base-daf27b85f1877c5a802abe7362a0490f89c25ae5.tar.gz
frameworks_base-daf27b85f1877c5a802abe7362a0490f89c25ae5.tar.bz2
am fd2f8d43: am 51b921d0: DO NOT MERGE - Preserve the order of InputMethodManager method calls
* commit 'fd2f8d43419d1f25ced8b2bac96407925dd4c471': DO NOT MERGE - Preserve the order of InputMethodManager method calls
-rw-r--r--core/java/com/android/internal/view/IInputMethodManager.aidl2
1 files changed, 1 insertions, 1 deletions
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 @@ interface IInputMethodManager {
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);
}