nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 43cf1ae7: am f66b0e5f: am c08c5064: Merge "Fix an NPE when running with Keep." into lmp-dev 

* commit '43cf1ae7bb2e2e5c917b27ce9669ae12e547c15f':
  Fix an NPE when running with Keep.
Jean Chalard 2014-08-06 17:47:45 +00:00 committed by Android Git Automerger
parent 2809183cb6 43cf1ae7bb
commit acc827b8dd
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
java/src/com/android/inputmethod/latin/LatinIME.java
View File

@ -776,15 +776,15 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
private void onStartInputInternal(final EditorInfo editorInfo, final boolean restarting) { private void onStartInputInternal(final EditorInfo editorInfo, final boolean restarting) {
super.onStartInput(editorInfo, restarting); super.onStartInput(editorInfo, restarting);
if (editorInfo == null) {
Log.e(TAG, "Null EditorInfo in onStartInput()");
return;
}
SettingsValues currentSettingsValues = mSettings.getCurrent(); SettingsValues currentSettingsValues = mSettings.getCurrent();
final boolean isSameInputType = currentSettingsValues.isSameInputType(editorInfo); final boolean isSameInputType = currentSettingsValues.isSameInputType(editorInfo);
final boolean hasSameOrientation = final boolean hasSameOrientation =
currentSettingsValues.hasSameOrientation(getResources().getConfiguration()); currentSettingsValues.hasSameOrientation(getResources().getConfiguration());
mRichImm.clearSubtypeCaches(); mRichImm.clearSubtypeCaches();
if (editorInfo == null) {
Log.e(TAG, "Null EditorInfo in onStartInput()");
return;
}
final boolean inputTypeChanged = !isSameInputType; final boolean inputTypeChanged = !isSameInputType;
final boolean isDifferentTextField = !restarting || inputTypeChanged; final boolean isDifferentTextField = !restarting || inputTypeChanged;
if (isDifferentTextField || !hasSameOrientation) { if (isDifferentTextField || !hasSameOrientation) {