diff options
4 files changed, 17 insertions, 3 deletions
diff --git a/tests/camera/src/android/hardware/camera2/cts/PerformanceTest.java b/tests/camera/src/android/hardware/camera2/cts/PerformanceTest.java index 48d1580e52b..6876cf6165c 100644 --- a/tests/camera/src/android/hardware/camera2/cts/PerformanceTest.java +++ b/tests/camera/src/android/hardware/camera2/cts/PerformanceTest.java @@ -983,6 +983,7 @@ public class PerformanceTest { ZoomDirection direction, ZoomRange range) throws Exception { final int ZOOM_STEPS = 5; final float ZOOM_ERROR_MARGIN = 0.05f; + final float ERROR_THRESH_FACTOR = 0.33f; final int ZOOM_IN_MIN_IMPROVEMENT_IN_FRAMES = 1; final int MAX_IMPROVEMENT_VARIATION = 2; for (String id : mTestRule.getCameraIdsUnderTest()) { @@ -1047,6 +1048,10 @@ public class PerformanceTest { for (int j = 0; j < NUM_ZOOM_STEPS; j++) { float zoomFactor = startRatio + (endRatio - startRatio) * (j + 1) / NUM_ZOOM_STEPS; + // The error margin needs to be adjusted based on the zoom step size. + // We take the min of ZOOM_ERROR_MARGIN and 1/3 of zoom ratio step. + float zoomErrorMargin = Math.min(ZOOM_ERROR_MARGIN, + (float) Math.abs(zoomFactor - previousRatio) * ERROR_THRESH_FACTOR); previewBuilder.set(CaptureRequest.CONTROL_ZOOM_RATIO, zoomFactor); int newSequenceId = mTestRule.getCameraSession().setRepeatingRequest( previewBuilder.build(), resultListener, mTestRule.getHandler()); @@ -1068,13 +1073,13 @@ public class PerformanceTest { assertTrue(String.format("Zoom ratio should monotonically increase/decrease" + " or stay the same (previous = %f, current = %f", previousRatio, resultZoomFactor), - Math.abs(previousRatio - resultZoomFactor) < ZOOM_ERROR_MARGIN + Math.abs(previousRatio - resultZoomFactor) < zoomErrorMargin || (direction == ZoomDirection.ZOOM_IN && previousRatio < resultZoomFactor) || (direction == ZoomDirection.ZOOM_OUT && previousRatio > resultZoomFactor)); - if (Math.abs(resultZoomFactor - zoomFactor) < ZOOM_ERROR_MARGIN + if (Math.abs(resultZoomFactor - zoomFactor) < zoomErrorMargin && improvement == 0) { improvement = (int) (lastFrameNumberForRequest + 1 - frameNumber); } diff --git a/tests/tests/graphics/src/android/graphics/cts/VulkanFeaturesTest.java b/tests/tests/graphics/src/android/graphics/cts/VulkanFeaturesTest.java index dac061c7a1f..3f85600cff1 100644 --- a/tests/tests/graphics/src/android/graphics/cts/VulkanFeaturesTest.java +++ b/tests/tests/graphics/src/android/graphics/cts/VulkanFeaturesTest.java @@ -94,6 +94,7 @@ public class VulkanFeaturesTest { private JSONObject mVkJSON = null; private JSONObject mVulkanDevices[]; private JSONObject mBestDevice = null; + private boolean mIsTV = false; @Before public void setup() throws Throwable { @@ -116,6 +117,8 @@ public class VulkanFeaturesTest { if (DEBUG) { Log.d(TAG, feature.name + "=" + feature.version); } + } else if (PackageManager.FEATURE_LEANBACK.equals(feature.name)) { + mIsTV = true; } } } @@ -306,6 +309,7 @@ public class VulkanFeaturesTest { @Test public void testAndroidBaselineProfile2021Support() throws JSONException { assumeTrue("Skipping because Vulkan is not supported", mVulkanHardwareVersion != null); + assumeTrue("Skipping because ABP is not required of TV devices", !mIsTV); if (!hasOnlyCpuDevice()) { assertEquals("This device must support the ABP 2021.", "", nativeGetABPSupport()); diff --git a/tests/tests/security/src/android/security/cts/CertificateData.java b/tests/tests/security/src/android/security/cts/CertificateData.java index d088d0a77bc..08ff3c30cf7 100644 --- a/tests/tests/security/src/android/security/cts/CertificateData.java +++ b/tests/tests/security/src/android/security/cts/CertificateData.java @@ -77,6 +77,7 @@ class CertificateData { "4C:DD:51:A3:D1:F5:20:32:14:B0:C6:C5:32:23:03:91:C7:46:42:6D", "0D:44:DD:8C:3C:8C:1A:1A:58:75:64:81:E9:0F:2E:2A:FF:B3:D2:6E", "CA:3A:FB:CF:12:40:36:4B:44:B2:16:20:88:80:48:39:19:93:7C:F7", + "F4:27:86:EB:6E:B8:6D:88:31:67:02:FB:BA:66:A4:53:00:AA:7A:A6", "5F:B7:EE:06:33:E2:59:DB:AD:0C:4C:9A:E6:D3:8F:1A:61:C7:DC:25", "49:0A:75:74:DE:87:0A:47:FE:58:EE:F6:C7:6B:EB:C6:0B:12:40:99", "89:D4:83:03:4F:9E:9A:48:80:5F:72:37:D4:A9:A6:EF:CB:7C:1F:D1", @@ -95,7 +96,6 @@ class CertificateData { "B5:61:EB:EA:A4:DE:E4:25:4B:69:1A:98:A5:57:47:C2:34:C7:D9:71", "73:A5:E6:4A:3B:FF:83:16:FF:0E:DC:CC:61:8A:90:6E:4E:AE:4D:74", "07:E0:32:E0:20:B7:2C:3F:19:2F:06:28:A2:59:3A:19:A7:0F:06:9E", - "D6:DA:A8:20:8D:09:D2:15:4D:24:B5:2F:CB:34:6E:B2:58:B2:8A:58", "80:94:64:0E:B5:A7:A1:CA:11:9C:1F:DD:D5:9F:81:02:63:A7:FB:D1", "84:1A:69:FB:F5:CD:1A:25:34:13:3D:E3:F8:FC:B8:99:D0:C9:14:B7", "E7:F3:A3:C8:CF:6F:C3:04:2E:6D:0E:67:32:C5:9E:68:95:0D:5E:D2", @@ -159,6 +159,7 @@ class CertificateData { "5A:8C:EF:45:D7:A6:98:59:76:7A:8C:8B:44:96:B5:78:CF:47:4B:1A", "8D:A7:F9:65:EC:5E:FC:37:91:0F:1C:6E:59:FD:C1:CC:6A:6E:DE:16", "B1:2E:13:63:45:86:A4:6F:1A:B2:60:68:37:58:2D:C4:AC:FD:94:97", + "D5:EC:8D:7B:4C:BA:79:F4:E7:E8:CB:9D:6B:AE:77:83:10:03:21:6A", }; static final String[] WFA_CERTIFICATE_DATA = { diff --git a/tools/cts-tradefed/res/config/cts-exclude.xml b/tools/cts-tradefed/res/config/cts-exclude.xml index b754596cd74..4de96680e55 100644 --- a/tools/cts-tradefed/res/config/cts-exclude.xml +++ b/tools/cts-tradefed/res/config/cts-exclude.xml @@ -33,4 +33,8 @@ <!-- Exclude @SecurityTest tests from CTS. These are tested in STS. b/180417031--> <option name="compatibility:test-arg" value="com.android.tradefed.testtype.AndroidJUnitTest:exclude-annotation:android.platform.test.annotations.AsbSecurityTest" /> <option name="compatibility:test-arg" value="com.android.compatibility.common.tradefed.testtype.JarHostTest:exclude-annotation:android.platform.test.annotations.AsbSecurityTest" /> + + <!-- Exclude CtsJvmtiRunTest912HostTestCases as it depends on implementation details of the ART + module. b/287732826 --> + <option name="compatibility:exclude-filter" value="CtsJvmtiRunTest912HostTestCases" /> </configuration> |