diff options
| author | Remi NGUYEN VAN <reminv@google.com> | 2019-03-17 19:12:02 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-03-17 19:12:02 -0700 |
| commit | 926f3949ddb6c850252716fb345285e1befe5e84 (patch) | |
| tree | 0e0ab2f63a16974625eb78cd38116a6f53ce0354 /src/com/android/server/NetworkStackService.java | |
| parent | 2339d8e96615c4471b8fef48590e49b250fa1632 (diff) | |
| parent | d9a4d5110984900d4ae7f94ebcac9550319e939e (diff) | |
Merge "Remove NetworkParcelable" am: 205886d28f am: 7201f61c57
am: 13be9e9fcd
Change-Id: Ifec0dd683bf9c9b73c4af12835b76d284559daf8
Diffstat (limited to 'src/com/android/server/NetworkStackService.java')
| -rw-r--r-- | src/com/android/server/NetworkStackService.java | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/com/android/server/NetworkStackService.java b/src/com/android/server/NetworkStackService.java index 72955bb..e7c8e85 100644 --- a/src/com/android/server/NetworkStackService.java +++ b/src/com/android/server/NetworkStackService.java @@ -19,7 +19,6 @@ package com.android.server; import static android.net.dhcp.IDhcpServer.STATUS_INVALID_ARGUMENT; import static android.net.dhcp.IDhcpServer.STATUS_SUCCESS; import static android.net.dhcp.IDhcpServer.STATUS_UNKNOWN_ERROR; -import static android.net.shared.NetworkParcelableUtil.fromStableParcelable; import static com.android.server.util.PermissionUtil.checkDumpPermission; import static com.android.server.util.PermissionUtil.checkNetworkStackCallingPermission; @@ -35,7 +34,6 @@ import android.net.INetworkMonitor; import android.net.INetworkMonitorCallbacks; import android.net.INetworkStackConnector; import android.net.Network; -import android.net.NetworkParcelable; import android.net.PrivateDnsConfigParcel; import android.net.dhcp.DhcpServer; import android.net.dhcp.DhcpServingParams; @@ -152,12 +150,10 @@ public class NetworkStackService extends Service { } @Override - public void makeNetworkMonitor( - NetworkParcelable network, String name, INetworkMonitorCallbacks cb) + public void makeNetworkMonitor(Network network, String name, INetworkMonitorCallbacks cb) throws RemoteException { - final Network parsedNetwork = fromStableParcelable(network); - final SharedLog log = addValidationLogs(parsedNetwork, name); - final NetworkMonitor nm = new NetworkMonitor(mContext, cb, parsedNetwork, log); + final SharedLog log = addValidationLogs(network, name); + final NetworkMonitor nm = new NetworkMonitor(mContext, cb, network, log); cb.onNetworkMonitorCreated(new NetworkMonitorImpl(nm)); } |