diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2021-06-21 10:34:48 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-06-21 10:34:48 +0000 |
| commit | ccbb71ef886d207d88eebcd10ae659e274972e75 (patch) | |
| tree | 778d8c8da2ebf2701bc020d2963b35b4934b8159 /java | |
| parent | 0e63df46f1151407d4438ae23ae118039879d9e2 (diff) | |
| parent | b31d848746f9d5ec08d307d83a5f530c962d510e (diff) | |
| download | ethernet-ccbb71ef886d207d88eebcd10ae659e274972e75.tar.gz | |
Merge "Stop using LinkPropertiesParcelableUtil." am: aca3a829fa am: b31d848746
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1733473
Change-Id: I51829f89466e518712f117675eef40792577ece3
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(); } |