diff options
| author | satok <satok@google.com> | 2012-12-19 10:24:45 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-12-19 10:24:45 -0800 |
| commit | 5ce0226708ec75b8636d062ae89aeb410c06659c (patch) | |
| tree | 1b244f60e1a10434c24b4bee8838f3bf8e9287d6 /services | |
| parent | a8d7b52c88ec0dea889affeaa9311b6f7ae43538 (diff) | |
| parent | 7ad7b2c437d10fb8e7221e6e28aa247217f93681 (diff) | |
| download | frameworks_base-5ce0226708ec75b8636d062ae89aeb410c06659c.zip frameworks_base-5ce0226708ec75b8636d062ae89aeb410c06659c.tar.gz frameworks_base-5ce0226708ec75b8636d062ae89aeb410c06659c.tar.bz2 | |
am 7ad7b2c4: am 32b81205: Fix a bug where disabled auxilialy IME is unexpectedly re-enabled
* commit '7ad7b2c437d10fb8e7221e6e28aa247217f93681':
Fix a bug where disabled auxilialy IME is unexpectedly re-enabled
Diffstat (limited to 'services')
| -rw-r--r-- | services/java/com/android/server/InputMethodManagerService.java | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/services/java/com/android/server/InputMethodManagerService.java b/services/java/com/android/server/InputMethodManagerService.java index a296d34..cd920b1 100644 --- a/services/java/com/android/server/InputMethodManagerService.java +++ b/services/java/com/android/server/InputMethodManagerService.java @@ -782,6 +782,9 @@ 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( @@ -805,6 +808,9 @@ public class InputMethodManagerService extends IInputMethodManager.Stub if (!isSystemIme(imi)) { return false; } + if (imi.isAuxiliaryIme()) { + return false; + } return containsSubtypeOf(imi, ENGLISH_LOCALE.getLanguage()); } @@ -2856,6 +2862,9 @@ 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)) { |