commit 46b33d45f7a06ef900349a76329fd77c8ef34d6b
author Treehugger Robot <treehugger-gerrit@google.com> Mon Apr 09 22:23:16 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Apr 09 22:23:16 2018 +0000
tree e3c17fcbbce93239c7a396489a0984956f82c05e
parent f582e9dede933b8e6c9e27740282127cd722272a
parent 1c7d94f2f759a0421456cd516051d481133e3e36

Merge changes from topic "asb-2018-04-n" into nougat-cts-dev

* changes:
  DO NOT MERGE CTS for presence of avc fix for b/70897454
  DO NOT MERGE Add CTS test for URI fix.
  DO NOT MERGE CTS additions for b/72165027
  DO NOT MERGE CTS tests for b/70897394

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 05e826a..5c54cda 100644
--- a/tests/cts/net/src/android/net/cts/UriTest.java
+++ b/tests/cts/net/src/android/net/cts/UriTest.java
@@ -114,6 +114,12 @@
         assertEquals("a:a@example.com:a@example2.com", uri.getAuthority());
         assertEquals("example2.com", uri.getHost());
         assertEquals(-1, uri.getPort());
+        assertEquals("/path", uri.getPath());
+
+        uri = Uri.parse("http://a.foo.com\\.example.com/path");
+        assertEquals("a.foo.com", uri.getHost());
+        assertEquals(-1, uri.getPort());
+        assertEquals("\\.example.com/path", uri.getPath());
     }
 
     public void testCompareTo() {