From 7018a90c323a7f0deb37939d5505ff112ac637f5 Mon Sep 17 00:00:00 2001
From: satok <satok@google.com>
Date: Thu, 24 May 2012 18:10:37 +0900
Subject: [PATCH] Fix the issue on matching the locale in
 TextServicesManagerService

Bug: 6542210

Change-Id: I42d84b684d5689e8fceecb705bb51d19d847477a
---
 .../java/com/android/server/TextServicesManagerService.java | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/services/java/com/android/server/TextServicesManagerService.java b/services/java/com/android/server/TextServicesManagerService.java
index 499ff7a730b0d..c7b336f411b09 100644
--- a/services/java/com/android/server/TextServicesManagerService.java
+++ b/services/java/com/android/server/TextServicesManagerService.java
@@ -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;
                         }