Merge "Merge "Fix IME visibility after lock screen" into rvc-dev am:...

Merge "Merge "Fix IME visibility after lock screen" into rvc-dev am: fcaa5a86 am: 36f7ed12" into rvc-d1-dev-plus-aosp am: 6031d0c4 am: c80dc5c2

Change-Id: I88596c7b0202dd4dfdfddd5828f90d9ed1ae7a36

parents 7f268f7a c80dc5c2

core/java/android/view/ImeInsetsSourceConsumer.java

+0 −3

Original line number	Diff line number	Diff line
		@@ -143,9 +143,6 @@ public final class ImeInsetsSourceConsumer extends InsetsSourceConsumer {
		public void setControl(@Nullable InsetsSourceControl control, int[] showTypes,
		int[] hideTypes) {
		super.setControl(control, showTypes, hideTypes);
		if (control == getControl()) {
		return;
		}
		if (control == null && !mIsRequestedVisibleAwaitingControl) {
		hide();
		}