diff options
| author | Serik Beketayev <serikb@google.com> | 2020-12-06 23:08:08 -0800 |
|---|---|---|
| committer | Serik Beketayev <serikb@google.com> | 2020-12-23 22:15:51 -0800 |
| commit | 4abaecefc2aa518d1e610a9e9bdad58ee4f6840c (patch) | |
| tree | e9a489be7935fddf5546401b5dbf08e8d661104c /services/devicepolicy | |
| parent | a34d9a7af11af589af3aafb72e874ceeacf86a7f (diff) | |
[Mainline] Migrate ProxyInfo
Bug: 173455434
Test: atest FrameworksNetTests
Change-Id: I924aed710b62a0c91b888a9e04ac2c90cdfd88d0
Diffstat (limited to 'services/devicepolicy')
| -rw-r--r-- | services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index b20c4935f4e3..43537d067bce 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -285,6 +285,7 @@ import com.android.internal.widget.LockPatternUtils; import com.android.internal.widget.LockSettingsInternal; import com.android.internal.widget.LockscreenCredential; import com.android.internal.widget.PasswordValidationError; +import com.android.net.module.util.ProxyUtils; import com.android.server.LocalServices; import com.android.server.LockGuard; import com.android.server.PersistentDataBlockManagerInternal; @@ -7759,7 +7760,8 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { } exclusionList = exclusionList.trim(); - ProxyInfo proxyProperties = new ProxyInfo(data[0], proxyPort, exclusionList); + ProxyInfo proxyProperties = ProxyInfo.buildDirectProxy(data[0], proxyPort, + ProxyUtils.exclusionStringAsList(exclusionList)); if (!proxyProperties.isValid()) { Slog.e(LOG_TAG, "Invalid proxy properties, ignoring: " + proxyProperties.toString()); return; |