diff options
author | Hugo Benichi <hugobenichi@google.com> | 2017-09-26 14:51:11 +0900 |
---|---|---|
committer | Hugo Benichi <hugobenichi@google.com> | 2017-09-28 15:22:13 +0900 |
commit | d9e551957b6b18b5260149f291101146de68aa0e (patch) | |
tree | 4069adc3026ebf5424485414a0d2959ecc2a1fe8 /tests/net/java/com/android/server/NsdServiceTest.java | |
parent | bff14ae56fe922549bea1f905606000b02cbacd7 (diff) |
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
Diffstat (limited to 'tests/net/java/com/android/server/NsdServiceTest.java')
-rw-r--r-- | tests/net/java/com/android/server/NsdServiceTest.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/net/java/com/android/server/NsdServiceTest.java b/tests/net/java/com/android/server/NsdServiceTest.java index 2e49c98ca9b6..b88c784bed5d 100644 --- 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 |