Merge changes I67dbf04a,I032f6741

am: 727ec42d8d Change-Id: I4c8ce0fa68ae3fbf2a3e835d165a766b6e6aad5c
2018-02-26 22:01:25 +00:00
parent 942249a2dd 727ec42d8d
commit 6b24cc5769
1 changed files with 2 additions and 1 deletions
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDialogTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDialogTest.java
@@ -155,7 +155,8 @@ public class BluetoothPairingDialogTest {

        // check that showSoftInput was called to make input method appear when the dialog was shown
        assertThat(view.isFocused()).isTrue();
-        assertThat(imm.isActive());
+        // TODO(b/73892004): Figure out why this is failing.
+        // assertThat(imm.isActive()).isTrue();
        verify(imm).showSoftInput(view, InputMethodManager.SHOW_IMPLICIT);
    }