diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-06-23 01:07:56 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-06-23 01:07:56 +0000 |
commit | 4ebed5a5af4fddc0297945599f7db05919c06c69 (patch) | |
tree | 778d8c8da2ebf2701bc020d2963b35b4934b8159 | |
parent | b1a164f384baa45962a8d1e1bd7a29136549fd71 (diff) | |
parent | 8da3f621b09e384b11029ce0213f782fdf284de9 (diff) | |
download | ethernet-android12L-s1-release.tar.gz |
Snap for 7482035 from 8da3f621b09e384b11029ce0213f782fdf284de9 to sc-v2-releaseandroid-vts-12.1_r9android-vts-12.1_r8android-vts-12.1_r7android-vts-12.1_r6android-vts-12.1_r5android-vts-12.1_r4android-vts-12.1_r3android-vts-12.1_r2android-vts-12.1_r10android-vts-12.1_r1android-platform-12.1.0_r9android-platform-12.1.0_r8android-platform-12.1.0_r7android-platform-12.1.0_r6android-platform-12.1.0_r5android-platform-12.1.0_r4android-platform-12.1.0_r3android-platform-12.1.0_r27android-platform-12.1.0_r26android-platform-12.1.0_r25android-platform-12.1.0_r24android-platform-12.1.0_r23android-platform-12.1.0_r22android-platform-12.1.0_r21android-platform-12.1.0_r20android-platform-12.1.0_r2android-platform-12.1.0_r19android-platform-12.1.0_r18android-platform-12.1.0_r17android-platform-12.1.0_r16android-platform-12.1.0_r15android-platform-12.1.0_r14android-platform-12.1.0_r13android-platform-12.1.0_r12android-platform-12.1.0_r11android-platform-12.1.0_r10android-platform-12.1.0_r1android-cts-12.1_r9android-cts-12.1_r8android-cts-12.1_r7android-cts-12.1_r6android-cts-12.1_r5android-cts-12.1_r4android-cts-12.1_r3android-cts-12.1_r2android-cts-12.1_r10android-cts-12.1_r1android-12.1.0_r6android-12.1.0_r5android-12.1.0_r4android-12.1.0_r3android-12.1.0_r27android-12.1.0_r2android-12.1.0_r1android12L-tests-releaseandroid12L-s1-releaseandroid12L-releaseandroid12L-platform-releaseandroid12L-gsi
Change-Id: I4f0b87b5a96fb0be933d2252bc9d0fea0c7fa77b
-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(); } |