diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2021-06-21 10:08:52 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-06-21 10:08:52 +0000 |
| commit | b31d848746f9d5ec08d307d83a5f530c962d510e (patch) | |
| tree | 3ec28d244389b55151ea4dfd487ac82275260dd7 /java | |
| parent | 6a101064f244876a1cc0b59ec00cdd9baf4d8b7b (diff) | |
| parent | aca3a829fa4fa5d496f3719cc66cebcc888d84cc (diff) | |
| download | ethernet-b31d848746f9d5ec08d307d83a5f530c962d510e.tar.gz | |
Merge "Stop using LinkPropertiesParcelableUtil." am: aca3a829fa
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1733473
Change-Id: I723327ade7f1f8134a907e58910812e73ba84968
Diffstat (limited to 'java')
| -rw-r--r-- | java/com/android/server/ethernet/EthernetNetworkFactory.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/java/com/android/server/ethernet/EthernetNetworkFactory.java b/java/com/android/server/ethernet/EthernetNetworkFactory.java index aa80e4d..28b24f1 100644 --- a/java/com/android/server/ethernet/EthernetNetworkFactory.java +++ b/java/com/android/server/ethernet/EthernetNetworkFactory.java @@ -16,8 +16,6 @@ package com.android.server.ethernet; -import static android.net.shared.LinkPropertiesParcelableUtil.toStableParcelable; - import static com.android.internal.util.Preconditions.checkNotNull; import android.annotation.NonNull; @@ -560,7 +558,7 @@ public class EthernetNetworkFactory extends NetworkFactory { if (config.getProxySettings() == ProxySettings.STATIC || config.getProxySettings() == ProxySettings.PAC) { try { - ipClient.setHttpProxy(toStableParcelable(config.getHttpProxy())); + ipClient.setHttpProxy(config.getHttpProxy()); } catch (RemoteException e) { e.rethrowFromSystemServer(); } |