commit d98c20b036ff02f99406dabb8cc4fdf4a51cd6c4
author Tadashi G. Takaoka <takaoka@google.com> Fri Nov 12 15:26:54 2010 -0800
committer Tadashi G. Takaoka <takaoka@google.com> Fri Nov 12 15:26:54 2010 -0800
tree 5c7b4fca2952c20eebfe5f1d60210aa74be8c543
parent 6a567370ce0f78e89bc1f4a52e0af3c5634a349e

Fix NPE that is caused by null EditorInfo

Bug: 3192772
Change-Id: Ia057d29e070ccbb90ee60df1e141de14de95f820

java/src/com/android/inputmethod/latin/LatinIME.java

diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index 7078211..e0ce9c9 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -513,7 +513,8 @@
             mOrientation = conf.orientation;
             final int mode = mKeyboardSwitcher.getKeyboardMode();
             final EditorInfo attribute = getCurrentInputEditorInfo();
-            mKeyboardSwitcher.loadKeyboard(mode, attribute.imeOptions, mVoiceButtonEnabled,
+            final int imeOptions = (attribute != null) ? attribute.imeOptions : 0;
+            mKeyboardSwitcher.loadKeyboard(mode, imeOptions, mVoiceButtonEnabled,
                     mVoiceButtonOnPrimary);
         }
 
@@ -2273,7 +2274,8 @@
         }
         final int mode = mKeyboardSwitcher.getKeyboardMode();
         final EditorInfo attribute = getCurrentInputEditorInfo();
-        mKeyboardSwitcher.loadKeyboard(mode, attribute.imeOptions, mVoiceButtonEnabled,
+        final int imeOptions = (attribute != null) ? attribute.imeOptions : 0;
+        mKeyboardSwitcher.loadKeyboard(mode, imeOptions, mVoiceButtonEnabled,
                 mVoiceButtonOnPrimary);
         initSuggest(mLanguageSwitcher.getInputLanguage());
         mLanguageSwitcher.persist();