diff options
3 files changed, 10 insertions, 9 deletions
diff --git a/tests/input/res/raw/test_keyboard_register.json b/tests/input/res/raw/test_keyboard_register.json index 044ea0df1ba..c5d7a089c50 100644 --- a/tests/input/res/raw/test_keyboard_register.json +++ b/tests/input/res/raw/test_keyboard_register.json @@ -8,8 +8,8 @@ "bus": "usb", "configuration":[ {"type": 100, "data": [1]}, // UI_SET_EVBIT : EV_KEY - // UI_SET_KEYBIT : KEY_Q, KEY_W, KEY_E, KEY_A, KEY_B, KEY_C, KEY_ALT_LEFT, KEY_GRAVE, + // UI_SET_KEYBIT : KEY_Q, KEY_W, KEY_E, KEY_A, KEY_B, KEY_C, KEY_ALT_LEFT, KEY_ESC, // KEY_META_LEFT, KEY_DEL, KEY_DPAD_LEFT - {"type": 101, "data": [16, 17, 18, 30, 48, 46, 56, 41, 125, 14, 105]} + {"type": 101, "data": [16, 17, 18, 30, 48, 46, 56, 1, 125, 14, 105]} ] } diff --git a/tests/input/src/android/input/cts/BackKeyShortcutsTest.kt b/tests/input/src/android/input/cts/BackKeyShortcutsTest.kt index 91f352c1449..7f7eac519f0 100644 --- a/tests/input/src/android/input/cts/BackKeyShortcutsTest.kt +++ b/tests/input/src/android/input/cts/BackKeyShortcutsTest.kt @@ -55,10 +55,10 @@ private fun injectKeyUp(device: UinputDevice, scanCode: Int) { class BackKeyShortcutsTest { companion object { - const val KEY_META_LEFT = 125 - const val KEY_GRAVE = 41 - const val KEY_DEL = 14 - const val KEY_DPAD_LEFT = 105 + const val KEY_LEFTMETA = 125 + const val KEY_ESC = 1 + const val KEY_BACKSPACE = 14 + const val KEY_LEFT = 105 } private val instrumentation = InstrumentationRegistry.getInstrumentation() @@ -102,11 +102,11 @@ class BackKeyShortcutsTest { PollingCheck.waitFor { inputManager.getInputDevice(keyboardDevice.deviceId) != null } activity.assertNoEvents() - for (scanCode in intArrayOf(KEY_GRAVE, KEY_DEL, KEY_DPAD_LEFT)) { - injectKeyDown(keyboardDevice, KEY_META_LEFT) + for (scanCode in intArrayOf(KEY_BACKSPACE, KEY_LEFT)) { + injectKeyDown(keyboardDevice, KEY_LEFTMETA) injectKeyDown(keyboardDevice, scanCode) injectKeyUp(keyboardDevice, scanCode) - injectKeyUp(keyboardDevice, KEY_META_LEFT) + injectKeyUp(keyboardDevice, KEY_LEFTMETA) assertReceivedEventsCorrectlyMapped(2, KeyEvent.KEYCODE_BACK) } diff --git a/tests/tests/keystore/src/android/keystore/cts/KeyAttestationTest.java b/tests/tests/keystore/src/android/keystore/cts/KeyAttestationTest.java index b0d8026287f..553d99707f9 100644 --- a/tests/tests/keystore/src/android/keystore/cts/KeyAttestationTest.java +++ b/tests/tests/keystore/src/android/keystore/cts/KeyAttestationTest.java @@ -515,6 +515,7 @@ public class KeyAttestationTest { public void testEcAttestation_UniqueIdWorksWithCorrectPermission() throws Exception { assumeTrue("Device doesn't have secure lock screen", TestUtils.hasSecureLockScreen(getContext())); + assumeTrue("Device does not support attestation", TestUtils.isAttestationSupported()); String keystoreAlias = "test_key"; KeyGenParameterSpec spec = new KeyGenParameterSpec.Builder(keystoreAlias, PURPOSE_SIGN) |