diff options
| author | Satoshi Kataoka <satok@google.com> | 2013-01-09 23:44:28 -0800 |
|---|---|---|
| committer | satok <satok@google.com> | 2013-01-10 17:42:56 +0900 |
| commit | 9d08143fa72ad87572a7d5c714f379262a73e1b2 (patch) | |
| tree | d0260cf6c539e7e905d8586b0f386c57e3d90375 /services/java/com/android/server/InputMethodManagerService.java | |
| parent | 481102eed6d8eaff07489717bde7fc59a5dea5bf (diff) | |
| download | frameworks_base-9d08143fa72ad87572a7d5c714f379262a73e1b2.zip frameworks_base-9d08143fa72ad87572a7d5c714f379262a73e1b2.tar.gz frameworks_base-9d08143fa72ad87572a7d5c714f379262a73e1b2.tar.bz2 | |
Revert "Fix a bug where disabled auxilialy IME is unexpectedly re-enabled"
This reverts commit 32b812054cce27d1c70b53ba8ac729c7186b105e
Bug: 7976890
Change-Id: I75ab60734153719b199cf7281d23f5eb1ad2d1bc
Diffstat (limited to 'services/java/com/android/server/InputMethodManagerService.java')
| -rw-r--r-- | services/java/com/android/server/InputMethodManagerService.java | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/services/java/com/android/server/InputMethodManagerService.java b/services/java/com/android/server/InputMethodManagerService.java index 8eb61dd..94e0bd4 100644 --- a/services/java/com/android/server/InputMethodManagerService.java +++ b/services/java/com/android/server/InputMethodManagerService.java @@ -782,9 +782,6 @@ public class InputMethodManagerService extends IInputMethodManager.Stub if (!isSystemIme(imi)) { return false; } - if (imi.isAuxiliaryIme()) { - return false; - } if (imi.getIsDefaultResourceId() != 0) { try { Resources res = context.createPackageContext( @@ -808,9 +805,6 @@ public class InputMethodManagerService extends IInputMethodManager.Stub if (!isSystemIme(imi)) { return false; } - if (imi.isAuxiliaryIme()) { - return false; - } return containsSubtypeOf(imi, ENGLISH_LOCALE.getLanguage()); } @@ -2862,9 +2856,6 @@ public class InputMethodManagerService extends IInputMethodManager.Stub List<Pair<String, ArrayList<String>>> enabledInputMethodsList = mSettings .getEnabledInputMethodsAndSubtypeListLocked(); - if (DEBUG) { - Slog.d(TAG, (enabled ? "Enable " : "Disable ") + id); - } if (enabled) { for (Pair<String, ArrayList<String>> pair: enabledInputMethodsList) { if (pair.first.equals(id)) { |