Fix an NPE when running with Keep.

Change-Id: Ie703e14bff42d34608f11d0c2d7758950b84c88c
This commit is contained in:
Jean Chalard 2014-08-06 13:00:05 +09:00
parent 9273f3832b
commit 411fa5909b

View file

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