diff options
| author | Satoshi Kataoka <satok@google.com> | 2012-05-30 20:05:44 +0900 |
|---|---|---|
| committer | Satoshi Kataoka <satok@google.com> | 2012-05-30 20:36:52 +0900 |
| commit | 17150cf91be1478e367c2ef5e4f5baaa66b487d0 (patch) | |
| tree | b8e3d68f6a9fef0291cb2f60092ab6736002bb1d /services/java/com/android/server/TextServicesManagerService.java | |
| parent | 38616ccc94b1e1a605ab43cc5c230d6acc729a15 (diff) | |
Fix locale in TextServicesManagerService
Bug: 6542210
Change-Id: I1670fac014beb834ec7c065ebf040d0ff3cf4161
Diffstat (limited to 'services/java/com/android/server/TextServicesManagerService.java')
| -rw-r--r-- | services/java/com/android/server/TextServicesManagerService.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/services/java/com/android/server/TextServicesManagerService.java b/services/java/com/android/server/TextServicesManagerService.java index c7b336f411b0..c74dd0038c5f 100644 --- a/services/java/com/android/server/TextServicesManagerService.java +++ b/services/java/com/android/server/TextServicesManagerService.java @@ -198,7 +198,7 @@ public class TextServicesManagerService extends ITextServicesManager.Stub { } // TODO: Respect allowImplicitlySelectedSubtype - // TODO: Save SpellCheckerSubtype by supported languages. + // TODO: Save SpellCheckerSubtype by supported languages by looking at "locale". @Override public SpellCheckerSubtype getCurrentSpellCheckerSubtype( String locale, boolean allowImplicitlySelectedSubtype) { @@ -250,10 +250,10 @@ public class TextServicesManagerService extends ITextServicesManager.Stub { for (int i = 0; i < sci.getSubtypeCount(); ++i) { final SpellCheckerSubtype scs = sci.getSubtypeAt(i); if (hashCode == 0) { - if (candidateLocale.equals(locale)) { + final String scsLocale = scs.getLocale(); + if (candidateLocale.equals(scsLocale)) { return scs; } else if (candidate == null) { - final String scsLocale = scs.getLocale(); if (candidateLocale.length() >= 2 && scsLocale.length() >= 2 && candidateLocale.startsWith(scsLocale)) { // Fall back to the applicable language |