From 0cba0c11f64115933783627a31525cca9a2f32d9 Mon Sep 17 00:00:00 2001
From: satok <satok@google.com>
Date: Mon, 5 Sep 2011 17:31:56 +0900
Subject: [PATCH] Support automatic language

Bug: 5057886

Change-Id: I807776b0a3d1286c66ba032c3701b3503911664c
---
 .../inputmethod/compat/InputMethodSubtypeCompatWrapper.java    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/java/src/com/android/inputmethod/compat/InputMethodSubtypeCompatWrapper.java b/java/src/com/android/inputmethod/compat/InputMethodSubtypeCompatWrapper.java
index b6b86a4a0..a6bb83adf 100644
--- a/java/src/com/android/inputmethod/compat/InputMethodSubtypeCompatWrapper.java
+++ b/java/src/com/android/inputmethod/compat/InputMethodSubtypeCompatWrapper.java
@@ -100,8 +100,7 @@ public final class InputMethodSubtypeCompatWrapper extends AbstractCompatWrapper
     public String getLocale() {
         if (mObj == null) return mDummyLocale;
         final String s = (String)CompatUtils.invoke(mObj, null, METHOD_getLocale);
-        if (TextUtils.isEmpty(s)) return DEFAULT_LOCALE;
-        return s;
+        return s != null ? s : DEFAULT_LOCALE;
     }
 
     public String getMode() {