diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-01-12 21:11:43 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2022-01-12 21:11:43 +0000 |
| commit | 0f7e5f3f07eaf468a20cc9684222605571ce538c (patch) | |
| tree | 16b6abb39bd839de16a4fe2891f5a27245bdca47 | |
| parent | 11257b2f701aee4fc20ad96445389c1d41c601f2 (diff) | |
| parent | e6d07912dd9d5d9407133422b818cee88a56fd1d (diff) | |
| download | cts-sparse-8072972-L97000000952739047.tar.gz | |
Merge "Snap for 8070672 from 7d4161d8e829987135e0aa256874f8d35e4cf446 to android12-tests-release" into android12-tests-releasesparse-8072972-L97000000952739047
| -rwxr-xr-x | tests/MediaProviderTranscode/res/raw/testVideo_HEVC_long.mp4 | bin | 250798892 -> 4758997 bytes | |||
| -rwxr-xr-x | tests/MediaProviderTranscode/res/raw/testVideo_HEVC_medium.mp4 | bin | 67269470 -> 1115500 bytes | |||
| -rwxr-xr-x | tests/MediaProviderTranscode/res/raw/testVideo_HEVC_small.mp4 | bin | 671136 -> 22681 bytes | |||
| -rwxr-xr-x | tests/MediaProviderTranscode/res/raw/testVideo_Legacy.mp4 | bin | 67084678 -> 1682831 bytes | |||
| -rw-r--r-- | tests/MediaProviderTranscode/res/raw/testvideo_HEVC.mp4 | bin | 18026669 -> 399521 bytes | |||
| -rw-r--r-- | tests/tests/graphics/src/android/graphics/cts/VulkanFeaturesTest.java | 2 | ||||
| -rw-r--r-- | tools/cts-tradefed/res/config/cts-known-failures.xml | 2 |
7 files changed, 3 insertions, 1 deletions
diff --git a/tests/MediaProviderTranscode/res/raw/testVideo_HEVC_long.mp4 b/tests/MediaProviderTranscode/res/raw/testVideo_HEVC_long.mp4 Binary files differindex 6b371538de8..c8d4b8ff3f3 100755 --- a/tests/MediaProviderTranscode/res/raw/testVideo_HEVC_long.mp4 +++ b/tests/MediaProviderTranscode/res/raw/testVideo_HEVC_long.mp4 diff --git a/tests/MediaProviderTranscode/res/raw/testVideo_HEVC_medium.mp4 b/tests/MediaProviderTranscode/res/raw/testVideo_HEVC_medium.mp4 Binary files differindex 207530ce382..96cf7b1d45b 100755 --- a/tests/MediaProviderTranscode/res/raw/testVideo_HEVC_medium.mp4 +++ b/tests/MediaProviderTranscode/res/raw/testVideo_HEVC_medium.mp4 diff --git a/tests/MediaProviderTranscode/res/raw/testVideo_HEVC_small.mp4 b/tests/MediaProviderTranscode/res/raw/testVideo_HEVC_small.mp4 Binary files differindex f2aa045b173..b2b0f5d81bc 100755 --- a/tests/MediaProviderTranscode/res/raw/testVideo_HEVC_small.mp4 +++ b/tests/MediaProviderTranscode/res/raw/testVideo_HEVC_small.mp4 diff --git a/tests/MediaProviderTranscode/res/raw/testVideo_Legacy.mp4 b/tests/MediaProviderTranscode/res/raw/testVideo_Legacy.mp4 Binary files differindex 1c74ffaeab0..001667d3d66 100755 --- a/tests/MediaProviderTranscode/res/raw/testVideo_Legacy.mp4 +++ b/tests/MediaProviderTranscode/res/raw/testVideo_Legacy.mp4 diff --git a/tests/MediaProviderTranscode/res/raw/testvideo_HEVC.mp4 b/tests/MediaProviderTranscode/res/raw/testvideo_HEVC.mp4 Binary files differindex 8a3dba2da95..fcc1bb4af5a 100644 --- a/tests/MediaProviderTranscode/res/raw/testvideo_HEVC.mp4 +++ b/tests/MediaProviderTranscode/res/raw/testvideo_HEVC.mp4 diff --git a/tests/tests/graphics/src/android/graphics/cts/VulkanFeaturesTest.java b/tests/tests/graphics/src/android/graphics/cts/VulkanFeaturesTest.java index 8fbdd2f88c6..837e3cb2a77 100644 --- a/tests/tests/graphics/src/android/graphics/cts/VulkanFeaturesTest.java +++ b/tests/tests/graphics/src/android/graphics/cts/VulkanFeaturesTest.java @@ -327,7 +327,7 @@ public class VulkanFeaturesTest { } } JSONObject limits = device.getJSONObject("properties").getJSONObject("limits"); - int maxPerStageDescriptorStorageBuffers = limits.getInt("maxPerStageDescriptorStorageBuffers"); + long maxPerStageDescriptorStorageBuffers = limits.getLong("maxPerStageDescriptorStorageBuffers"); if (DEBUG) { Log.d(TAG, device.getJSONObject("properties").getString("deviceName") + ": variablePointers=" + variablePointers + diff --git a/tools/cts-tradefed/res/config/cts-known-failures.xml b/tools/cts-tradefed/res/config/cts-known-failures.xml index affd617f2d4..aa99f6854be 100644 --- a/tools/cts-tradefed/res/config/cts-known-failures.xml +++ b/tools/cts-tradefed/res/config/cts-known-failures.xml @@ -275,4 +275,6 @@ <option name="compatibility:exclude-filter" value="CtsTelephonyTestCases android.telephony.ims.cts.RcsUceAdapterTest#testForbidCapabilitiesRequest" /> <option name="compatibility:exclude-filter" value="CtsTelephonyTestCases android.telephony.ims.cts.RcsUceAdapterTest#testTimeoutToRequestCapabilitiesWithPresenceMechanism" /> + <!-- b/182630972, b/214019488 --> + <option name="compatibility:exclude-filter" value="CtsWindowManagerDeviceTestCases android.server.wm.PinnedStackTests#testEnterPipWithMinimalSize" /> </configuration> |