diff options
| author | Serik Beketayev <serikb@google.com> | 2020-12-25 09:45:54 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-25 09:45:54 +0000 |
| commit | 40e7949c5f64676ffe6a992fdaddd04a64e549d4 (patch) | |
| tree | 8cfd43477a884ccdd980ce49164706e54ad0e136 /services/devicepolicy | |
| parent | 0b39593d11e1346e9ef216a625bf1745eeafe090 (diff) | |
| parent | 5565118666481fcb6da80efb4c5eec03368ff70f (diff) | |
Merge "[Mainline] Migrate ProxyInfo" am: 3c3711dffd am: 5565118666
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1506616
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ica0e0965296e3bf843fa73fc6d687da6a9ae721d
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 dd48ac80f0be..f390d06c8ab5 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -286,6 +286,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; @@ -7774,7 +7775,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; |