Merge "Fix race condition in NsdManagerTest" am: f2383db747 am: 2dfb494827 am: ba82d646a6

am: ac7ad05464 Change-Id: Ia9237e9be9db7447985726be06a3d9020ab72087
2017-05-31 13:34:20 +00:00
parent a8731d3470 ac7ad05464
commit 76fab4b83c
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);