diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2022-06-16 18:57:00 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2022-06-16 18:57:00 +0000 |
| commit | c24167748bfd131c0df2ff68ee36e0a99010cee6 (patch) | |
| tree | bf91e18e3fe56e20ad5c23008e88b5dd56105485 | |
| parent | 2e3ca65862be50a77b803aac5a7e553e15a439ac (diff) | |
| parent | a0f7fbcc20d0d0724d96b53d852a3bc8e664283e (diff) | |
| download | cts-c24167748bfd131c0df2ff68ee36e0a99010cee6.tar.gz | |
Merge "Flaky test: CtsDisplayTestCases android.display.cts.DisplayTest#testActivityContextGetMetrics" into tm-dev
| -rw-r--r-- | tests/tests/display/src/android/display/cts/DisplayTest.java | 7 | ||||
| -rw-r--r-- | tools/cts-tradefed/res/config/cts-known-failures.xml | 3 |
2 files changed, 9 insertions, 1 deletions
diff --git a/tests/tests/display/src/android/display/cts/DisplayTest.java b/tests/tests/display/src/android/display/cts/DisplayTest.java index 2d44420568c..fcb33a29399 100644 --- a/tests/tests/display/src/android/display/cts/DisplayTest.java +++ b/tests/tests/display/src/android/display/cts/DisplayTest.java @@ -554,12 +554,17 @@ public class DisplayTest { Display display = getSecondaryDisplay(manager.getDisplays()); Point outSize = new Point(); - display.getSize(outSize); + display.getRealSize(outSize); DisplayMetrics outMetrics = new DisplayMetrics(); outMetrics.setToDefaults(); display.getMetrics(outMetrics); + assertEquals("Secondary display real size width is unexpected; height: " + outSize.y + + " name " + display.getName() + " id " + display.getDisplayId() + + " type " + display.getType(), SECONDARY_DISPLAY_WIDTH, outSize.x); + assertEquals(SECONDARY_DISPLAY_HEIGHT, outSize.y); + assertEquals("Secondary display width is unexpected; height: " + outMetrics.heightPixels + " name " + display.getName() + " id " + display.getDisplayId() + " type " + display.getType(), SECONDARY_DISPLAY_WIDTH, outMetrics.widthPixels); diff --git a/tools/cts-tradefed/res/config/cts-known-failures.xml b/tools/cts-tradefed/res/config/cts-known-failures.xml index f8b05bf729d..052528183ec 100644 --- a/tools/cts-tradefed/res/config/cts-known-failures.xml +++ b/tools/cts-tradefed/res/config/cts-known-failures.xml @@ -275,4 +275,7 @@ <option name="compatibility:exclude-filter" value="CtsMonkeyTestCases com.android.cts.monkey.CategoryTest#testSingleCategory" /> <option name="compatibility:exclude-filter" value="CtsMonkeyTestCases com.android.cts.monkey.CategoryTest#testMultipleCategories" /> + <!-- b/208909067 --> + <option name="compatibility:exclude-filter" value="CtsDisplayTestCases android.display.cts.DisplayTest#testActivityContextGetMetrics" /> + </configuration> |