Merge "Fix NPE in NsdServiceTest" am: 60d5390f7a

am: f9422cc65b Change-Id: I2c88d81081c7994d42eb2715f29233817730201d
2017-09-28 12:28:44 +00:00
parent f4c8a84039 f9422cc65b
commit a5d620ae92
1 changed files with 4 additions and 1 deletions
--- a/tests/net/java/com/android/server/NsdServiceTest.java
+++ b/tests/net/java/com/android/server/NsdServiceTest.java
@@ -77,7 +77,10 @@ public class NsdServiceTest {

    @After
    public void tearDown() throws Exception {
-        mThread.quit();
+        if (mThread != null) {
+            mThread.quit();
+            mThread = null;
+        }
    }

    @Test