commit a53c889dff2031f9eb20594c1a172c6a228c0298
author Przemyslaw Szczepaniak <pszczepaniak@google.com> Tue Jul 21 09:39:07 2015 +0100
committer Narayan Kamath <narayan@google.com> Thu Nov 12 09:09:50 2015 +0000
tree 4b8f4ea069111aa7e948586ec70953d1b1ad5958
parent ddca1aec2a8e3ee33d8e3fc0879fc6eb722c33cd

Fix URL.path handling.

Change-Id: Id1246130ad8218848a8574fb9c6d12e219e705fd

ojluni/src/main/java/java/net/URL.java

diff --git a/ojluni/src/main/java/java/net/URL.java b/ojluni/src/main/java/java/net/URL.java
index d1537b5..674de4e 100755
--- a/ojluni/src/main/java/java/net/URL.java
+++ b/ojluni/src/main/java/java/net/URL.java
@@ -1359,6 +1359,9 @@
         } else {
             path = file;
         }
+        if (path.charAt(0) != '/') {
+            path = '/' + path;
+        }
     }
 
     String getPath() {

ojluni/src/main/java/java/net/URLStreamHandler.java

diff --git a/ojluni/src/main/java/java/net/URLStreamHandler.java b/ojluni/src/main/java/java/net/URLStreamHandler.java
index 1143130..9be93f4 100755
--- a/ojluni/src/main/java/java/net/URLStreamHandler.java
+++ b/ojluni/src/main/java/java/net/URLStreamHandler.java
@@ -262,7 +262,10 @@
         if (path == null)
             path = "";
 
-        if (isRelPath) {
+        // ----- BEGIN android -----
+        //if (isRelPath) {
+        if (true) {
+        // ----- END android -----
             // Remove embedded /./
             while ((i = path.indexOf("/./")) >= 0) {
                 path = path.substring(0, i) + path.substring(i + 2);