commit 7f94af0714c4783bb052c1343ed98890278dd34f
author Bill Yi <byi@google.com> Mon Aug 24 01:30:04 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Aug 24 01:30:04 2020 +0000
tree 9c4a43c242bf92beb925b218c7cdad5894a33e18
parent 69d2c71ab41a472b2d1e4f2d612eaecfcbe76c02
parent 8fe94ff00e4ff9d7474f66809eacf45272669d4a

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 39d1448781 -s ours am: 8fe94ff00e -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/ManagedProvisioning/+/12431530

Change-Id: Ia2d24af240dbdb4e93fd4880cb1d00aa914015a8

src/com/android/managedprovisioning/task/wifi/WifiConfigurationProvider.java

diff --git a/src/com/android/managedprovisioning/task/wifi/WifiConfigurationProvider.java b/src/com/android/managedprovisioning/task/wifi/WifiConfigurationProvider.java
index c89b45a..9df18c4 100644
--- a/src/com/android/managedprovisioning/task/wifi/WifiConfigurationProvider.java
+++ b/src/com/android/managedprovisioning/task/wifi/WifiConfigurationProvider.java
@@ -20,6 +20,7 @@
 import android.net.IpConfiguration;
 import android.net.IpConfiguration.ProxySettings;
 import android.net.ProxyInfo;
+import android.net.Uri;
 import android.net.wifi.WifiConfiguration;
 import android.net.wifi.WifiEnterpriseConfig;
 import android.text.TextUtils;
@@ -326,7 +327,7 @@
             ipConfig.setHttpProxy(new ProxyInfo(proxyHost, proxyPort, proxyBypassHosts));
         } else {
             ipConfig.setProxySettings(ProxySettings.PAC);
-            ipConfig.setHttpProxy(new ProxyInfo(pacUrl));
+            ipConfig.setHttpProxy(new ProxyInfo(Uri.parse(pacUrl)));
         }
         wifiConf.setIpConfiguration(ipConfig);
     }