Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 7018a90c: Fix the issue on matching the locale in TextServicesManagerService

Browse Source 
* commit '7018a90c323a7f0deb37939d5505ff112ac637f5':
  Fix the issue on matching the locale in TextServicesManagerService
This commit is contained in:
satok
2012-05-24 03:35:55 -07:00
committed by Android Git Automerger
parent 77f79a39c0 7018a90c32
commit 1323644014
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/java/com/android/server/TextServicesManagerService.java
View File

@@ -254,10 +254,8 @@ public class TextServicesManagerService extends ITextServicesManager.Stub {
return scs;
} else if (candidate == null) {
final String scsLocale = scs.getLocale();
if (candidateLocale.length() >= 2
&& scsLocale.length() >= 2
&& candidateLocale.substring(0, 2).equals(
scsLocale.substring(0, 2))) {
if (candidateLocale.length() >= 2 && scsLocale.length() >= 2
&& candidateLocale.startsWith(scsLocale)) {
// Fall back to the applicable language
candidate = scs;
}