LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "[Mainline] Migrate ProxyInfo" am: 3c3711dffd am: 9b3f669024

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1506616

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ica0e0965296e3bf843fa73fc6d687da6a9ae721d
This commit is contained in:
Serik Beketayev
2020-12-25 09:45:54 +00:00
committed by Automerger Merge Worker
parent feaf7a261e 9b3f669024
commit 51c010aacd
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
services/core/java/com/android/server/net/IpConfigStore.java
View File

@@ -30,6 +30,7 @@ import android.util.Log;
import android.util.SparseArray; import android.util.SparseArray;
import com.android.internal.annotations.VisibleForTesting; import com.android.internal.annotations.VisibleForTesting;
import com.android.net.module.util.ProxyUtils;
import java.io.BufferedInputStream; import java.io.BufferedInputStream;
import java.io.DataInputStream; import java.io.DataInputStream;
@@ -123,7 +124,8 @@ public class IpConfigStore {
switch (config.proxySettings) { switch (config.proxySettings) {
case STATIC: case STATIC:
ProxyInfo proxyProperties = config.httpProxy; ProxyInfo proxyProperties = config.httpProxy;
String exclusionList = proxyProperties.getExclusionListAsString(); String exclusionList = ProxyUtils.exclusionListAsString(
proxyProperties.getExclusionList());
out.writeUTF(PROXY_SETTINGS_KEY); out.writeUTF(PROXY_SETTINGS_KEY);
out.writeUTF(config.proxySettings.toString()); out.writeUTF(config.proxySettings.toString());
out.writeUTF(PROXY_HOST_KEY); out.writeUTF(PROXY_HOST_KEY);
@@ -370,13 +372,14 @@ public class IpConfigStore {
switch (proxySettings) { switch (proxySettings) {
case STATIC: case STATIC:
ProxyInfo proxyInfo = ProxyInfo proxyInfo = ProxyInfo.buildDirectProxy(proxyHost, proxyPort,
new ProxyInfo(proxyHost, proxyPort, exclusionList); ProxyUtils.exclusionStringAsList(exclusionList));
config.proxySettings = proxySettings; config.proxySettings = proxySettings;
config.httpProxy = proxyInfo; config.httpProxy = proxyInfo;
break; break;
case PAC: case PAC:
ProxyInfo proxyPacProperties = new ProxyInfo(Uri.parse(pacFileUrl)); ProxyInfo proxyPacProperties =
ProxyInfo.buildPacProxy(Uri.parse(pacFileUrl));
config.proxySettings = proxySettings; config.proxySettings = proxySettings;
config.httpProxy = proxyPacProperties; config.httpProxy = proxyPacProperties;
break; break;

4
services/tests/servicestests/src/com/android/server/net/IpConfigStoreTest.java
View File

@@ -39,6 +39,7 @@ import java.io.ByteArrayOutputStream;
import java.io.DataOutputStream; import java.io.DataOutputStream;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.util.Arrays;
/** /**
* Unit tests for {@link IpConfigStore} * Unit tests for {@link IpConfigStore}
@@ -82,7 +83,8 @@ public class IpConfigStoreTest {
staticIpConfiguration.dnsServers.add(InetAddresses.parseNumericAddress(DNS_IP_ADDR_1)); staticIpConfiguration.dnsServers.add(InetAddresses.parseNumericAddress(DNS_IP_ADDR_1));
staticIpConfiguration.dnsServers.add(InetAddresses.parseNumericAddress(DNS_IP_ADDR_2)); staticIpConfiguration.dnsServers.add(InetAddresses.parseNumericAddress(DNS_IP_ADDR_2));
ProxyInfo proxyInfo = new ProxyInfo("10.10.10.10", 88, "host1,host2"); ProxyInfo proxyInfo =
ProxyInfo.buildDirectProxy("10.10.10.10", 88, Arrays.asList("host1", "host2"));
IpConfiguration expectedConfig1 = new IpConfiguration(IpAssignment.STATIC, IpConfiguration expectedConfig1 = new IpConfiguration(IpAssignment.STATIC,
ProxySettings.STATIC, staticIpConfiguration, proxyInfo); ProxySettings.STATIC, staticIpConfiguration, proxyInfo);