Merge "Fix NPE in NsdServiceTest"

am: c30decbfe8 Change-Id: Ic9b7aaec14066d18247cc1efbdc06be1e6a79f29
2017-09-28 12:22:34 +00:00 · 2017-09-28 12:22:34 +00:00 · a9177b3748
commit a9177b3748
parent 38a3b1cda1 c30decbfe8
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