commit 6e1d96a6315ba2bbebd4853ce1150d4e6a55d767
author Aaron Huang <huangaaron@google.com> Fri Oct 18 18:35:17 2019 +0800
committer Aaron Huang <huangaaron@google.com> Thu Jul 09 04:02:08 2020 +0000
tree 1d743ae2dcd650c156ef1813a5c5ba32f70f3147
parent b2b5cb6ab8213c2faf711b40b3601763d4977812

Update ProxyInfo(String) to ProxyInfo(Uri)

Plan to remove ProxyInfo(String). Thus, update
caller to use ProxyInfo(Uri) instead.

Bug: 139268426
Bug: 135998869
Test: build pass
      atest ManagedProvisioningTests
Change-Id: Id633eca0a07a8ddd4068084590ebf7dc0f3de569

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 8a99801..aa50cca 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;
@@ -327,7 +328,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);
     }
@@ -345,4 +346,4 @@
         }
         throw new IllegalArgumentException("Unknown Phase 2 authentication method: " + phase2Auth);
     }
-}
\ No newline at end of file
+}