commit a220d6d27df5faa8000ac2bc9779ccda229f67a9
author Treehugger Robot <treehugger-gerrit@google.com> Wed Jan 10 18:59:52 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jan 10 18:59:52 2018 +0000
tree a1fc7661a28ec1bcb88324a6a8f15b4bcff459d1
parent 07e00f7523638c6c4d401142cd99eb5e0bae6a7a
parent 53a9c9bc347f3ff84c89dcf6a0fd80d4efcfea4d

Merge changes from topic "n" into nougat-cts-dev

* changes:
  DO NOT MERGE Add CTS test for URI fix.
  DO NOT MERGE Add EffectBundleTest
  DO NOT MERGE resolve merge conflicts of 4e1d862763 to mnc-dev
  DO NOT MERGE Add CTS test for cve_2017_0852_b_62815506

tests/cts/net/src/android/net/cts/UriTest.java

diff --git a/tests/cts/net/src/android/net/cts/UriTest.java b/tests/cts/net/src/android/net/cts/UriTest.java
index ab337d0..05e826a 100644
--- a/tests/cts/net/src/android/net/cts/UriTest.java
+++ b/tests/cts/net/src/android/net/cts/UriTest.java
@@ -109,6 +109,11 @@
         uri = Uri.parse("http://localhost");
         assertEquals("localhost", uri.getHost());
         assertEquals(-1, uri.getPort());
+
+        uri = Uri.parse("http://a:a@example.com:a@example2.com/path");
+        assertEquals("a:a@example.com:a@example2.com", uri.getAuthority());
+        assertEquals("example2.com", uri.getHost());
+        assertEquals(-1, uri.getPort());
     }
 
     public void testCompareTo() {