Merge "Fix an NPE in InputMethodService when mExtractAction is null." (85ff3fe1) · Commits · e / os / android_frameworks_base

core/java/android/inputmethodservice/InputMethodService.java

+10 −6

Original line number	Diff line number	Diff line
		@@ -1981,17 +1981,21 @@ public class InputMethodService extends AbstractInputMethodService {
		ei.inputType != InputType.TYPE_NULL);
		if (hasAction) {
		mExtractAccessories.setVisibility(View.VISIBLE);
		if (mExtractAction != null) {
		if (ei.actionLabel != null) {
		mExtractAction.setText(ei.actionLabel);
		} else {
		mExtractAction.setText(getTextForImeAction(ei.imeOptions));
		}
		mExtractAction.setOnClickListener(mActionClickListener);
		}
		} else {
		mExtractAccessories.setVisibility(View.GONE);
		if (mExtractAction != null) {
		mExtractAction.setOnClickListener(null);
		}
		}
		}

		/**
		* This is called when, while currently displayed in extract mode, the