| commit | 60d5390f7a23994bfe1a08104f59709a9ad12584 | [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 | 5b19f3fc01a9cf5a41235806892f7108339148d8 | |
| parent | 6201cc6f2711db13e4699ae1a95b6759dd11d3cc [diff] | |
| parent | d9e551957b6b18b5260149f291101146de68aa0e [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