| commit | 2240c54b87697c51e30a6f8efb74d32842babcf7 | [log] [tgz] |
|---|---|---|
| author | Hugo Benichi <hugobenichi@google.com> | Thu Sep 28 12:13:18 2017 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Thu Sep 28 12:13:18 2017 +0000 |
| tree | e0f3fcba20666cc13ccd922033fb03647e30df23 | |
| parent | 455fed6eb902c554e49c39eaabba0acb0dac1aa4 [diff] | |
| parent | 8d6846b3ad9a0422503aaf9e887b6de5c6319723 [diff] |
Merge "Fix NPE in NsdServiceTest"
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