diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-05-02 20:34:27 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-05-02 20:34:27 +0000 |
| commit | 3acd55107220bfd19ef76c9c95224bce028a3d61 (patch) | |
| tree | 2c7196570c583ee1f9ef92290fac0abda90e0678 | |
| parent | 4e1bd927ac69e9fe543d9a1e507f896279ce94ab (diff) | |
| parent | b10e48fd47b1f883c21540c55e6ae16bfd41df53 (diff) | |
| download | cts-android13-tests-release.tar.gz | |
Merge "Snap for 11792926 from 5fcef477252975694a2c7309b561b11e4c57fe87 to android13-tests-release" into android13-tests-releaseandroid13-tests-release
| -rw-r--r-- | tests/tests/keystore/src/android/keystore/cts/KeyAttestationTest.java | 2 | ||||
| -rw-r--r-- | tests/tests/telecom/src/android/telecom/cts/BaseTelecomTestWithMockServices.java | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/tests/tests/keystore/src/android/keystore/cts/KeyAttestationTest.java b/tests/tests/keystore/src/android/keystore/cts/KeyAttestationTest.java index 19bb686f094..109b5b899de 100644 --- a/tests/tests/keystore/src/android/keystore/cts/KeyAttestationTest.java +++ b/tests/tests/keystore/src/android/keystore/cts/KeyAttestationTest.java @@ -371,6 +371,7 @@ public class KeyAttestationTest { public void testAttestationKmVersionMatchesFeatureVersion() throws Exception { if (getContext().getPackageManager().hasSystemFeature(PackageManager.FEATURE_PC)) return; + assumeTrue("Device does not support attestation", TestUtils.isAttestationSupported()); String keystoreAlias = "test_key"; Date now = new Date(); @@ -416,6 +417,7 @@ public class KeyAttestationTest { public void testAttestationKmVersionMatchesFeatureVersionStrongBox() throws Exception { if (getContext().getPackageManager().hasSystemFeature(PackageManager.FEATURE_PC)) return; + assumeTrue("Device does not support attestation", TestUtils.isAttestationSupported()); int keyStoreFeatureVersionStrongBox = TestUtils.getFeatureVersionKeystoreStrongBox(getContext()); diff --git a/tests/tests/telecom/src/android/telecom/cts/BaseTelecomTestWithMockServices.java b/tests/tests/telecom/src/android/telecom/cts/BaseTelecomTestWithMockServices.java index 439b37790d9..c0ce1a50e53 100644 --- a/tests/tests/telecom/src/android/telecom/cts/BaseTelecomTestWithMockServices.java +++ b/tests/tests/telecom/src/android/telecom/cts/BaseTelecomTestWithMockServices.java @@ -276,9 +276,12 @@ public class BaseTelecomTestWithMockServices extends InstrumentationTestCase { TestUtils.executeShellCommand(getInstrumentation(), "telecom reset-car-mode"); if (mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_WATCH)) { - assertUiMode(Configuration.UI_MODE_TYPE_WATCH); + assertUiMode(Configuration.UI_MODE_TYPE_WATCH); + } else if (mContext.getPackageManager().hasSystemFeature( + PackageManager.FEATURE_AUTOMOTIVE)) { + assertUiMode(Configuration.UI_MODE_TYPE_CAR); } else { - assertUiMode(Configuration.UI_MODE_TYPE_NORMAL); + assertUiMode(Configuration.UI_MODE_TYPE_NORMAL); } AppOpsManager aom = mContext.getSystemService(AppOpsManager.class); |