From a887977c3e24b777e10ff0ae6e3617dac772a6c9 Mon Sep 17 00:00:00 2001 From: Remi NGUYEN VAN Date: Mon, 28 Jan 2019 15:15:59 +0900 Subject: Remove IpClient usage of NetworkManagementService Use the new NetworkObserverRegistry instead. Test: atest FrameworksNetTests NetworkStackTests Test: flashed, WiFi working fine Bug: 112869080 Change-Id: If16ecfd6489f86afec67c22b4c3692cd68f4edbf --- src/com/android/server/NetworkStackService.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/com/android/server/NetworkStackService.java') diff --git a/src/com/android/server/NetworkStackService.java b/src/com/android/server/NetworkStackService.java index 631ee45..7405c47 100644 --- a/src/com/android/server/NetworkStackService.java +++ b/src/com/android/server/NetworkStackService.java @@ -117,7 +117,11 @@ public class NetworkStackService extends Service { mObserverRegistry = new NetworkObserverRegistry(); mCm = context.getSystemService(ConnectivityManager.class); - // TODO: call mObserverRegistry here after adding sepolicy changes + try { + mObserverRegistry.register(mNetd); + } catch (RemoteException e) { + mLog.e("Error registering observer on Netd", e); + } } @NonNull @@ -158,7 +162,7 @@ public class NetworkStackService extends Service { @Override public void makeIpClient(String ifName, IIpClientCallbacks cb) throws RemoteException { - final IpClient ipClient = new IpClient(mContext, ifName, cb); + final IpClient ipClient = new IpClient(mContext, ifName, cb, mObserverRegistry); synchronized (mIpClients) { final Iterator> it = mIpClients.iterator(); -- cgit v1.2.3