| commit | c30decbfe81e769fe7ebcce4e3e29d9d6b348e04 | [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 | 9f04f7a609e3a463b31f31721a638202368b7485 [diff] | |
| parent | 210ab83b779e21a585295dc2f37e3f9e96eca9a0 [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