diff options
| author | Aaron Huang <huangaaron@google.com> | 2019-10-18 18:50:17 +0800 |
|---|---|---|
| committer | Aaron Huang <huangaaron@google.com> | 2020-07-06 14:26:07 +0000 |
| commit | 518a0a4ece4f685e522b94a267d58809d4fb04cf (patch) | |
| tree | fd4d3f939e7e7682221f05ca036795c21ad0c380 | |
| parent | 702f97dc86b90ae1b339ef3808c8a35d8c807eef (diff) | |
| download | wifi-518a0a4ece4f685e522b94a267d58809d4fb04cf.tar.gz | |
Update ProxyInfo(String) to ProxyInfo(Uri)android-r-beta-3android-r-beta-2
Use public API instead of using @hide API.
Bug: 160557668
Test: build pass
atest FrameworksNetTests
atest FrameworksWifiTests
Change-Id: Ic047fb45932130bfbb51ad0e27dac36741a2e62e
Merged-In: I6650e26d6f0a6455ded8a045c6c4efaa6dd7d742
| -rw-r--r-- | service/java/com/android/server/wifi/WifiBackupDataV1Parser.java | 4 | ||||
| -rw-r--r-- | service/java/com/android/server/wifi/util/XmlUtil.java | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/service/java/com/android/server/wifi/WifiBackupDataV1Parser.java b/service/java/com/android/server/wifi/WifiBackupDataV1Parser.java index 742cc99d8..e7e31911a 100644 --- a/service/java/com/android/server/wifi/WifiBackupDataV1Parser.java +++ b/service/java/com/android/server/wifi/WifiBackupDataV1Parser.java @@ -24,6 +24,7 @@ import android.net.NetworkUtils; import android.net.ProxyInfo; import android.net.RouteInfo; import android.net.StaticIpConfiguration; +import android.net.Uri; import android.net.wifi.WifiConfiguration; import android.util.Log; import android.util.Pair; @@ -556,7 +557,8 @@ class WifiBackupDataV1Parser implements WifiBackupDataParser { throw new XmlPullParserException("ProxyPac was missing in" + " IpConfiguration section"); } - ipConfiguration.setHttpProxy(new ProxyInfo(proxyPacFile)); + ipConfiguration.setHttpProxy( + ProxyInfo.buildPacProxy(Uri.parse(proxyPacFile))); break; case NONE: case UNASSIGNED: diff --git a/service/java/com/android/server/wifi/util/XmlUtil.java b/service/java/com/android/server/wifi/util/XmlUtil.java index db0f4289b..01407d1ee 100644 --- a/service/java/com/android/server/wifi/util/XmlUtil.java +++ b/service/java/com/android/server/wifi/util/XmlUtil.java @@ -26,6 +26,7 @@ import android.net.NetworkUtils; import android.net.ProxyInfo; import android.net.RouteInfo; import android.net.StaticIpConfiguration; +import android.net.Uri; import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiConfiguration.NetworkSelectionStatus; import android.net.wifi.WifiEnterpriseConfig; @@ -945,7 +946,8 @@ public class XmlUtil { case PAC: String proxyPacFile = (String) XmlUtil.readNextValueWithName(in, XML_TAG_PROXY_PAC_FILE); - ipConfiguration.setHttpProxy(new ProxyInfo(proxyPacFile)); + ipConfiguration.setHttpProxy( + ProxyInfo.buildPacProxy(Uri.parse(proxyPacFile))); break; case NONE: case UNASSIGNED: |