Commit e93c569b authored Jan 29, 2018 by Hugo Benichi

Prevent crash in NetworkManagementServiceTest#shutdown()

The shutdown method in NetworkManagementServiceTest was trying to close
the local socket on the test side, causing the NativeDaemonConnector
internal to NetworkManagementService to sometime crash due to the
output stream on NetworkManagementService side to throw on pending
reads.

The correct fix would be to shutdown the NativeDaemonConnector
inside NetworkManagementService and implement NetworkManagementService's
shutdown method, however there is no way to cleanly close a
NativeDaemonConnector.

Instead, this patch doesn't do any cleanup of the listening socket, the
test local socket, and its output stream. These objects' resources get
eventually collected by the system when the test process exits.

Test: runtest frameworks-net
Change-Id: I72c9aa43403754b55e9d23bf4f3ba8b7b4a3e10a

parent 5775177a

tests/net/java/com/android/server/NetworkManagementServiceTest.java

+6 −2

Original line number	Diff line number	Diff line
		@@ -99,8 +99,12 @@ public class NetworkManagementServiceTest {

		@After
		public void tearDown() throws Exception {
		if (mSocket != null) mSocket.close();
		if (mServerSocket != null) mServerSocket.close();
		mNMService.shutdown();
		// Once NetworkManagementService#shutdown() actually does something and shutdowns
		// the underlying NativeDaemonConnector, the block below should be uncommented.
		// if (mOutputStream != null) mOutputStream.close();
		// if (mSocket != null) mSocket.close();
		// if (mServerSocket != null) mServerSocket.close();
		}

		/**