commit 361664ead5ba7cd5344ca2512280f2f2031c8fd6
author Jason Monk <jmonk@google.com> Mon May 31 07:37:09 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon May 31 07:37:09 2021 +0000
tree 0ac8354b632a298e316bf3c4d648f45254155014
parent ee2dd0a46f64f6c039229d90349dfa42f73aaf72
parent 4c4bd56e9507908c7fc8b4827640fb76ed6c3e94

Merge "Fix reference to ProxyInfo extra" am: 4c4bd56e95

Original change: undetermined

Change-Id: I2f1673a6df4b0b11e0f4e961956c198124f2780e

core/java/android/net/ProxyInfo.java

diff --git a/core/java/android/net/ProxyInfo.java b/core/java/android/net/ProxyInfo.java
index ceedd98..7ea6bae 100644
--- a/core/java/android/net/ProxyInfo.java
+++ b/core/java/android/net/ProxyInfo.java
@@ -155,9 +155,6 @@
             mHost = source.getHost();
             mPort = source.getPort();
             mPacFileUrl = source.mPacFileUrl;
-            if (mPacFileUrl == null) {
-                mPacFileUrl = Uri.EMPTY;
-            }
             mExclusionList = source.getExclusionListAsString();
             mParsedExclusionList = source.mParsedExclusionList;
         } else {