Merge "Fix Ime consumer isRequestedVisible" into rvc-dev
diff --git a/core/java/android/view/ImeInsetsSourceConsumer.java b/core/java/android/view/ImeInsetsSourceConsumer.java
index bdc8ba8..df89130 100644
--- a/core/java/android/view/ImeInsetsSourceConsumer.java
+++ b/core/java/android/view/ImeInsetsSourceConsumer.java
@@ -153,7 +153,7 @@
@Override
protected boolean isRequestedVisibleAwaitingControl() {
- return mIsRequestedVisibleAwaitingControl;
+ return mIsRequestedVisibleAwaitingControl || isRequestedVisible();
}
private boolean isDummyOrEmptyEditor(EditorInfo info) {