Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove hidden API usage of Proxy.validate" am: a4a9e9bbc8 am: 1065160b6c

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id19b29b7140eeaa4d51821045f1b4549719b482c
This commit is contained in:
Remi NGUYEN VAN
2021-01-25 04:41:24 +00:00
committed by Automerger Merge Worker
parent 46c67f78b4 1065160b6c
commit be34fb2ce6
1 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
core/java/android/app/admin/DevicePolicyManager.java
View File

@@ -85,6 +85,7 @@ import android.security.keystore.StrongBoxUnavailableException;
import android.service.restrictions.RestrictionsReceiver;
import android.telephony.TelephonyManager;
import android.telephony.data.ApnSetting;
import android.text.TextUtils;
import android.util.ArraySet;
import android.util.Log;
import android.util.Pair;
@@ -4554,29 +4555,23 @@ public class DevicePolicyManager {
InetSocketAddress sa = (InetSocketAddress) proxySpec.address();
String hostName = sa.getHostName();
int port = sa.getPort();
StringBuilder hostBuilder = new StringBuilder();
final String hostSpec = hostBuilder.append(hostName)
.append(":").append(Integer.toString(port)).toString();
final String exclSpec;
final List<String> trimmedExclList;
if (exclusionList == null) {
exclSpec = "";
trimmedExclList = Collections.emptyList();
} else {
StringBuilder listBuilder = new StringBuilder();
boolean firstDomain = true;
trimmedExclList = new ArrayList<>(exclusionList.size());
for (String exclDomain : exclusionList) {
if (!firstDomain) {
listBuilder = listBuilder.append(",");
} else {
firstDomain = false;
}
listBuilder = listBuilder.append(exclDomain.trim());
trimmedExclList.add(exclDomain.trim());
}
exclSpec = listBuilder.toString();
}
if (android.net.Proxy.validate(hostName, Integer.toString(port), exclSpec)
!= android.net.Proxy.PROXY_VALID) throw new IllegalArgumentException();
final ProxyInfo info = ProxyInfo.buildDirectProxy(hostName, port, trimmedExclList);
// The hostSpec is built assuming that there is a specified port and hostname,
// but ProxyInfo.isValid() accepts 0 / empty as unspecified: also reject them.
if (port == 0 || TextUtils.isEmpty(hostName) || !info.isValid()) {
throw new IllegalArgumentException();
}
return new Pair<>(hostSpec, exclSpec);
return new Pair<>(hostName + ":" + port, TextUtils.join(",", trimmedExclList));
}
/**