diff options
| author | Remi NGUYEN VAN <reminv@google.com> | 2019-03-15 02:25:09 +0900 |
|---|---|---|
| committer | Remi NGUYEN VAN <reminv@google.com> | 2019-03-16 03:51:09 +0900 |
| commit | acd99d240142f65329a9a1b461fa99135260cb6b (patch) | |
| tree | 9242c3bd1b5b4740eb58f08554da21db961f61a4 /src/com/android/server/NetworkStackService.java | |
| parent | 15eaa7ac9f20a51008b9faa038e1fff1a8c63d09 (diff) | |
Remove NetworkParcelable
With the @JavaOnlyStableParcelable annotation, Network can now be used
as-is as a framework parcelable.
Test: atest FrameworksNetTests NetworkStackTests
Bug: 126477266
Change-Id: I5d9695a31b3ac48d10edcf08ccd0c34375353b79
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)); } |