From 17dc363a63a20d18cd8161f917899b39aed6ddd6 Mon Sep 17 00:00:00 2001
From: Ken Wakasa <kwakasa@google.com>
Date: Fri, 20 Aug 2010 18:28:22 +0900
Subject: Fix an NPE found in KeyboardSwitcher.isAlphabetMode()

Change-Id: I03d3d9b25147632d25c1502f796acad4cdaeb239
---
 java/src/com/android/inputmethod/latin/KeyboardSwitcher.java | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'java/src/com/android/inputmethod/latin/KeyboardSwitcher.java')

diff --git a/java/src/com/android/inputmethod/latin/KeyboardSwitcher.java b/java/src/com/android/inputmethod/latin/KeyboardSwitcher.java
index d04930303..88a2b8398 100644
--- a/java/src/com/android/inputmethod/latin/KeyboardSwitcher.java
+++ b/java/src/com/android/inputmethod/latin/KeyboardSwitcher.java
@@ -335,6 +335,9 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha
     }
 
     boolean isAlphabetMode() {
+        if (mCurrentId == null) {
+            return false;
+        }
         int currentMode = mCurrentId.mKeyboardMode;
         for (Integer mode : ALPHABET_MODES) {
             if (currentMode == mode) {
-- 
cgit v1.2.3-83-g751a