commit 51653c73499e61b1521865b2c2a637ee1de9f9e4
author Sergio Giro <sgiro@google.com> Wed Jun 22 19:27:32 2016 +0100
committer Sergio Giro <sgiro@google.com> Thu Jun 23 11:49:05 2016 +0100
tree e7377ae4843da05a42470d4da425f3acd43300aa
parent 54357dce161449ac9507f974b429184f9b1a2270

URL.java: remove unnecessary reflection

Helps detecting lacking classes at compilation time if those classes
are deleted

Bug: 29569605
Change-Id: I720d864e79599fca3c111b8055a73e4ac7f5201e

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 8af827c..15d09d1 100755
--- a/ojluni/src/main/java/java/net/URL.java
+++ b/ojluni/src/main/java/java/net/URL.java
@@ -1193,15 +1193,15 @@
             // Makes okhttp the default http/https handler
             if (handler == null) {
                 try {
+                    // BEGIN android-changed
+                    // Use of okhttp for http and https
+                    // Removed unnecessary use of reflection for sun classes
                     if (protocol.equals("file")) {
-                        handler = (URLStreamHandler)Class.
-                            forName("sun.net.www.protocol.file.Handler").newInstance();
+                        handler = new sun.net.www.protocol.file.Handler();
                     } else if (protocol.equals("ftp")) {
-                        handler = (URLStreamHandler)Class.
-                            forName("sun.net.www.protocol.ftp.Handler").newInstance();
+                        handler = new sun.net.www.protocol.ftp.Handler();
                     } else if (protocol.equals("jar")) {
-                        handler = (URLStreamHandler)Class.
-                            forName("sun.net.www.protocol.jar.Handler").newInstance();
+                        handler = new sun.net.www.protocol.jar.Handler();
                     } else if (protocol.equals("http")) {
                         handler = (URLStreamHandler)Class.
                             forName("com.android.okhttp.HttpHandler").newInstance();
@@ -1209,6 +1209,7 @@
                         handler = (URLStreamHandler)Class.
                             forName("com.android.okhttp.HttpsHandler").newInstance();
                     }
+                    // END android-changed
                 } catch (Exception e) {
                     throw new AssertionError(e);
                 }