commit 666f941b5adf79fa38dd3b7632dd48ffdf0a2d98
author Android Merger <noreply-android-build-merger@google.com> Mon Apr 09 22:38:18 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Apr 09 22:38:18 2018 +0000
tree 75a10edf72cfba28d92b04107c06e95e30e16732
parent f5e53a396f8b3d31c5322367df42542c6db21f37
parent a0de7cb8738548eaa3b04d9d969816f97e0fa9f0

Merge changes from topic "am-577c7e51c7294d17a1c29c24e9664b0a" into oreo-mr1-cts-dev

* changes:
  Merge changes from topic "am-a984919964a248a18190aca22d4db916" into oreo-cts-dev am: 0eeb6c53d1
  [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 8a0f955e56  -s ours am: 8dd2d10a1b  -s ours

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() {