diff options
| -rw-r--r-- | core/java/android/window/WindowTokenClient.java | 5 | ||||
| -rw-r--r-- | services/tests/wmtests/src/com/android/server/wm/InputMethodDialogWindowContextTest.java | 3 |
2 files changed, 4 insertions, 4 deletions
diff --git a/core/java/android/window/WindowTokenClient.java b/core/java/android/window/WindowTokenClient.java index f4f1b3b9b27b..c20b278f7eaa 100644 --- a/core/java/android/window/WindowTokenClient.java +++ b/core/java/android/window/WindowTokenClient.java @@ -31,10 +31,8 @@ import android.content.res.Configuration; import android.inputmethodservice.AbstractInputMethodService; import android.os.Binder; import android.os.Build; -import android.os.Bundle; import android.os.Debug; import android.os.Handler; -import android.os.IBinder; import android.util.Log; import com.android.internal.annotations.GuardedBy; @@ -76,8 +74,7 @@ public class WindowTokenClient extends Binder { * Attaches {@code context} to this {@link WindowTokenClient}. Each {@link WindowTokenClient} * can only attach one {@link Context}. * <p>This method must be called before invoking - * {@link android.view.IWindowManager#attachWindowContextToDisplayArea(IBinder, int, int, - * Bundle)}.<p/> + * {@link android.view.IWindowManager#attachWindowContextToDisplayArea}.<p/> * * @param context context to be attached * @throws IllegalStateException if attached context has already existed. diff --git a/services/tests/wmtests/src/com/android/server/wm/InputMethodDialogWindowContextTest.java b/services/tests/wmtests/src/com/android/server/wm/InputMethodDialogWindowContextTest.java index 41659113b1b2..da3a02ac525a 100644 --- a/services/tests/wmtests/src/com/android/server/wm/InputMethodDialogWindowContextTest.java +++ b/services/tests/wmtests/src/com/android/server/wm/InputMethodDialogWindowContextTest.java @@ -160,6 +160,9 @@ public class InputMethodDialogWindowContextTest extends WindowTestsBase { final DisplayAreaGroup firstDaGroup = mSecondaryDisplay.mFirstRoot; maxBoundsVerifier.setMaxBounds(firstDaGroup.getMaxBounds()); + // Clear the previous invocation histories in case we may count the previous + // onConfigurationChanged invocation into the next verification. + clearInvocations(tokenClient, imeContainer); firstDaGroup.placeImeContainer(imeContainer); verify(imeContainer, timeout(WAIT_TIMEOUT_MS)).onConfigurationChanged( |