Merge "Check null pointer agressively." (82652574) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/tablet/InputMethodButton.java

+7 −6

Original line number	Diff line number	Diff line
		@@ -184,6 +184,9 @@ public class InputMethodButton extends ImageView {
		}

		private void refreshStatusIcon() {
		if (mIcon == null) {
		return;
		}
		if (!needsToShowIMEButton()) {
		setVisibility(View.INVISIBLE);
		return;
		@@ -202,14 +205,12 @@ public class InputMethodButton extends ImageView {
		icon = getShortcutInputMethodAndSubtypeDrawable();
		break;
		}
		if (mIcon != null) {
		if (icon == null) {
		mIcon.setImageResource(R.drawable.ic_sysbar_ime_default);
		} else {
		mIcon.setImageDrawable(icon);
		}
		}
		}

		private int loadInputMethodSelectorVisibility() {
		return Settings.Secure.getInt(getContext().getContentResolver(),