From 8c69de30e01f76413bb3e7d12a69a71b1e6dd309 Mon Sep 17 00:00:00 2001 From: Xiao Ma Date: Mon, 24 Jan 2022 07:45:37 +0000 Subject: Replace the NetdService usage in the EthernetService. Ethernet service related files are going to be moved into Connectivity module. NetdService won't be visible to EthernetService. Use asInterface to get the Netd service instead. Bug: 210586283 Test: m Change-Id: I3bf504cd947f74bf5830659915483fe5331ac9eb --- java/com/android/server/ethernet/EthernetService.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'java') diff --git a/java/com/android/server/ethernet/EthernetService.java b/java/com/android/server/ethernet/EthernetService.java index 492a55a..e6fee9e 100644 --- a/java/com/android/server/ethernet/EthernetService.java +++ b/java/com/android/server/ethernet/EthernetService.java @@ -18,7 +18,6 @@ package com.android.server.ethernet; import android.content.Context; import android.net.INetd; -import android.net.util.NetdService; import android.os.Handler; import android.os.HandlerThread; import android.os.IBinder; @@ -41,11 +40,12 @@ public final class EthernetService extends SystemService { final EthernetNetworkFactory factory = new EthernetNetworkFactory(handler, context); mImpl = new EthernetServiceImpl( context, handler, - new EthernetTracker(context, handler, factory, getNetd())); + new EthernetTracker(context, handler, factory, getNetd(context))); } - private INetd getNetd() { - final INetd netd = NetdService.getInstance(); + private INetd getNetd(Context context) { + final INetd netd = + INetd.Stub.asInterface((IBinder) context.getSystemService(Context.NETD_SERVICE)); Objects.requireNonNull(netd, "could not get netd instance"); return netd; } -- cgit v1.2.3