Merge "Fix FD leak in NetworkStack" (f76b1e49) · Commits · e / os / android_packages_modules_NetworkStack

src/android/net/ip/IpClient.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -777,6 +777,7 @@ public class IpClient extends StateMachine {

		private void stopStateMachineUpdaters() {
		mObserverRegistry.unregisterObserver(mLinkObserver);
		mLinkObserver.shutdown();
		}

		@Override

+7 −1

Original line number	Diff line number	Diff line
		@@ -114,6 +114,7 @@ public class IpClientLinkObserver implements NetworkObserver {
		private DnsServerRepository mDnsServerRepository;
		private final AlarmManager mAlarmManager;
		private final Configuration mConfig;
		private final Handler mHandler;

		private final MyNetlinkMonitor mNetlinkMonitor;

		@@ -127,11 +128,16 @@ public class IpClientLinkObserver implements NetworkObserver {
		mLinkProperties = new LinkProperties();
		mLinkProperties.setInterfaceName(mInterfaceName);
		mConfig = config;
		mHandler = h;
		mInterfaceLinkState = true; // Assume up by default
		mDnsServerRepository = new DnsServerRepository(config.minRdnssLifetime);
		mAlarmManager = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE);
		mNetlinkMonitor = new MyNetlinkMonitor(h, log, mTag);
		h.post(mNetlinkMonitor::start);
		mHandler.post(mNetlinkMonitor::start);
		}

		public void shutdown() {
		mHandler.post(mNetlinkMonitor::stop);
		}

		private void maybeLog(String operation, String iface, LinkAddress address) {