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

am: 66749201a1 Change-Id: I5a4837078a7506b30497bba1cceb416ab37e82d9
2017-09-28 12:40:44 +00:00
parent 78d19e1d67 66749201a1
commit 9bb1e5ef72
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