commit 8d6846b3ad9a0422503aaf9e887b6de5c6319723
author Hugo Benichi <hugobenichi@google.com> Tue Sep 26 14:51:11 2017 +0900
committer Hugo Benichi <hugobenichi@google.com> Thu Sep 28 15:22:13 2017 +0900
tree 47b2fa438411d66105ffec6a0c3305b839bd11f5
parent 1c05049a5b967c6e8b71c32280f0c17609edb707

Fix NPE in NsdServiceTest

Continuous test dashboards report that quit() can crash sometimes
due to mThread being null.

This patch adds a null guard in tearDown().

Bug: 32561414
Test: runtest frameworks-net
Change-Id: If66fb47e31e77d25b4741a786f12eb78f0b9102e

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

diff --git a/tests/net/java/com/android/server/NsdServiceTest.java b/tests/net/java/com/android/server/NsdServiceTest.java
index 2e49c98..b88c784 100644
--- a/tests/net/java/com/android/server/NsdServiceTest.java
+++ b/tests/net/java/com/android/server/NsdServiceTest.java
@@ -77,7 +77,10 @@
 
     @After
     public void tearDown() throws Exception {
-        mThread.quit();
+        if (mThread != null) {
+            mThread.quit();
+            mThread = null;
+        }
     }
 
     @Test