commit 7018a90c323a7f0deb37939d5505ff112ac637f5
author satok <satok@google.com> Thu May 24 18:10:37 2012 +0900
committer satok <satok@google.com> Thu May 24 18:21:45 2012 +0900
tree 3ac7f730b995befed635e3dd27ce6b4ea8f4e567
parent f927e17ae543b6edeae8200cc86c59c3ee740670

Fix the issue on matching the locale in TextServicesManagerService

Bug: 6542210

Change-Id: I42d84b684d5689e8fceecb705bb51d19d847477a

services/java/com/android/server/TextServicesManagerService.java

diff --git a/services/java/com/android/server/TextServicesManagerService.java b/services/java/com/android/server/TextServicesManagerService.java
index 499ff7a..c7b336f 100644
--- a/services/java/com/android/server/TextServicesManagerService.java
+++ b/services/java/com/android/server/TextServicesManagerService.java
@@ -254,10 +254,8 @@
                         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;
                         }