De-flake WebViewTest.testGetContentHeight.
The WebView can be in a state where the contents scale and height
are non-zero but the WebView's height in the Android view tree
is zero. This occurs if these values are read between the WebView
requesting a layout pass and the layout pass occurring.
BUG: 11006894
Change-Id: I53d6776dd9aed9e35b357cfffe1bc71eb7109531
diff --git a/tests/tests/webkit/src/android/webkit/cts/WebViewTest.java b/tests/tests/webkit/src/android/webkit/cts/WebViewTest.java
index 0b8af7a..21fee65 100644
--- a/tests/tests/webkit/src/android/webkit/cts/WebViewTest.java
+++ b/tests/tests/webkit/src/android/webkit/cts/WebViewTest.java
@@ -1080,7 +1080,8 @@
new PollingCheck() {
@Override
protected boolean check() {
- return mOnUiThread.getScale() != 0 && mOnUiThread.getContentHeight() != 0;
+ return mOnUiThread.getScale() != 0 && mOnUiThread.getContentHeight() != 0
+ && mOnUiThread.getHeight() != 0;
}
}.run();
assertEquals(mOnUiThread.getHeight(),
