commit 700a01a25ea7ed84be5b66caa3124763c1e4a3b8
author gitbuildkicker <android-build@google.com> Fri Jan 06 13:30:22 2017 -0800
committer gitbuildkicker <android-build@google.com> Fri Jan 06 13:30:22 2017 -0800
tree e5abf11e452b966e8b5a7a84dde7232e27ade98b
parent 1bdd3f7a154badb20d55d52b878fe6d7c8069131
parent f715a8bd7c997a8fba197495929dce7f96b7c6dd

merge in lollipop-mr1-cts-release history after reset to lollipop-mr1-cts-dev

tests/expectations/knownfailures.txt

diff --git a/tests/expectations/knownfailures.txt b/tests/expectations/knownfailures.txt
index 207e9a5..36da380 100644
--- a/tests/expectations/knownfailures.txt
+++ b/tests/expectations/knownfailures.txt
@@ -1,5 +1,12 @@
 [
 {
+  description: "Disable ListeningPortsTest",
+  names: [
+    "android.security.cts.ListeningPortsTest"
+  ],
+  bug: 31803630
+},
+{
   description: "testWindowContentFrameStats is flaky without 75b55d0846159543aafc1b7420915497fce9b3f1",
   names: [
     "android.app.uiautomation.cts.UiAutomationTest#testWindowContentFrameStats"

tests/tests/webkit/src/android/webkit/cts/WebViewClientTest.java

diff --git a/tests/tests/webkit/src/android/webkit/cts/WebViewClientTest.java b/tests/tests/webkit/src/android/webkit/cts/WebViewClientTest.java
index 98d175f..e8a6397 100644
--- a/tests/tests/webkit/src/android/webkit/cts/WebViewClientTest.java
+++ b/tests/tests/webkit/src/android/webkit/cts/WebViewClientTest.java
@@ -232,7 +232,6 @@
             String url = testServer.setResponse(path, page, headers);
             assertFalse(webViewClient.hasOnReceivedLoginRequest());
             mOnUiThread.loadUrlAndWaitForCompletion(url);
-            assertTrue(webViewClient.hasOnReceivedLoginRequest());
             new PollingCheck(TEST_TIMEOUT) {
                 @Override
                 protected boolean check() {
@@ -647,6 +646,16 @@
         }
 
         @Override
+        public void onReceivedLoginRequest(WebView view, String realm, String account,
+                String args) {
+            super.onReceivedLoginRequest(view, realm, account, args);
+            mOnReceivedLoginRequest = true;
+            mOnReceivedLoginRealm = realm;
+            mOnReceivedLoginAccount = account;
+            mOnReceivedLoginArgs = args;
+        }
+
+        @Override
         public void onFormResubmission(WebView view, Message dontResend, Message resend) {
             mOnFormResubmissionCalled = true;
             dontResend.sendToTarget();