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.
commit
acc827b8dd
|
@ -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) {
|
||||
|
|
Loading…
Reference in New Issue