Merge "Fix NPE in NsdServiceTest" am: c30decbfe8 am: a9177b3748

am: a5d620ae92 Change-Id: Ieb299771438fe55566b76271815e52d02da799c8
2017-09-28 12:35:03 +00:00
parent 08e07a308a a9177b3748
commit 66749201a1
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