commit 8da3f621b09e384b11029ce0213f782fdf284de9
author Lorenzo Colitti <lorenzo@google.com> Tue Jun 22 14:58:46 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jun 22 14:58:46 2021 +0000
tree 778d8c8da2ebf2701bc020d2963b35b4934b8159
parent 364fadcad2f54621ff8f363fb5315a85cd5d98c8
parent 15f65af130262ae42f9cd93af1791dd8cbc18f0e

Stop using LinkPropertiesParcelableUtil. am: 15f65af130

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/15044794

Change-Id: I9d0522aa17c20045c144ca6212ad9e4e5eaaf6f1

java/com/android/server/ethernet/EthernetNetworkFactory.java

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 @@
             if (config.getProxySettings() == ProxySettings.STATIC ||
                     config.getProxySettings() == ProxySettings.PAC) {
                 try {
-                    ipClient.setHttpProxy(toStableParcelable(config.getHttpProxy()));
+                    ipClient.setHttpProxy(config.getHttpProxy());
                 } catch (RemoteException e) {
                     e.rethrowFromSystemServer();
                 }