Merge "Fix race condition in NsdManagerTest"

2017-05-31 12:56:55 +00:00
parent 30895c5e1e 22143956cf
commit f2383db747
1 changed files with 1 additions and 1 deletions
--- a/tests/net/java/android/net/nsd/NsdManagerTest.java
+++ b/tests/net/java/android/net/nsd/NsdManagerTest.java
@@ -333,7 +333,7 @@ public class NsdManagerTest {
    public static class MockServiceHandler extends Handler {
        public Context mContext;
        public AsyncChannel chan;
-        public Message lastMessage;
+        public volatile Message lastMessage;

        MockServiceHandler(Looper looper, Context context) {
            super(looper);