| Index: content/public/android/javatests/src/org/chromium/content/browser/input/ImeTest.java
|
| diff --git a/content/public/android/javatests/src/org/chromium/content/browser/input/ImeTest.java b/content/public/android/javatests/src/org/chromium/content/browser/input/ImeTest.java
|
| index 99686a4c8733c6956abff7939193703c8939acc7..de64517387b2238faeb9c11db52d0d6e4cb3ecdf 100644
|
| --- a/content/public/android/javatests/src/org/chromium/content/browser/input/ImeTest.java
|
| +++ b/content/public/android/javatests/src/org/chromium/content/browser/input/ImeTest.java
|
| @@ -978,9 +978,11 @@ public class ImeTest extends ContentShellTestBase {
|
| CriteriaHelper.pollForUIThreadCriteria(new Criteria() {
|
| @Override
|
| public boolean isSatisfied() {
|
| - boolean hasConnection = getAdapterInputConnection() != null;
|
| - return show == mInputMethodManagerWrapper.isShowWithoutHideOutstanding()
|
| - && show == hasConnection;
|
| + // We do not check the other way around: in some cases we need to keep
|
| + // input connection even when the last known status is 'hidden'.
|
| + // See crbug.com/569332 for more details.
|
| + if (show && getAdapterInputConnection() == null) return false;
|
| + return show == mInputMethodManagerWrapper.isShowWithoutHideOutstanding();
|
| }
|
| });
|
| }
|
|
|