drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix the issue on matching the locale in TextServicesManagerService

Browse Source 
Bug: 6542210

Change-Id: I42d84b684d5689e8fceecb705bb51d19d847477a
This commit is contained in:
satok
2012-05-24 18:10:37 +09:00
parent f927e17ae5
commit 7018a90c32
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; return scs;
} else if (candidate == null) { } else if (candidate == null) {
final String scsLocale = scs.getLocale(); final String scsLocale = scs.getLocale();
if (candidateLocale.length() >= 2 if (candidateLocale.length() >= 2 && scsLocale.length() >= 2
&& scsLocale.length() >= 2 && candidateLocale.startsWith(scsLocale)) {
&& candidateLocale.substring(0, 2).equals(
scsLocale.substring(0, 2))) {
// Fall back to the applicable language // Fall back to the applicable language
candidate = scs; candidate = scs;
} }