| commit | 76fab4b83c02678788287d8c9357d3afca6f157a | [log] [tgz] |
|---|---|---|
| author | Hugo Benichi <hugobenichi@google.com> | Wed May 31 13:34:20 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed May 31 13:34:20 2017 +0000 |
| tree | f588b49e650b50a60c2fc9d5b734962efa982783 | |
| parent | a8731d3470d26a7072076dc091f411e063cdfe94 [diff] | |
| parent | ac7ad05464d22d5179a180a56c0e42aade9b268a [diff] |
Merge "Fix race condition in NsdManagerTest" am: f2383db747 am: 2dfb494827 am: ba82d646a6 am: ac7ad05464 Change-Id: Ia9237e9be9db7447985726be06a3d9020ab72087
diff --git a/tests/net/java/android/net/nsd/NsdManagerTest.java b/tests/net/java/android/net/nsd/NsdManagerTest.java index 063cd5d..adf6998 100644 --- a/tests/net/java/android/net/nsd/NsdManagerTest.java +++ b/tests/net/java/android/net/nsd/NsdManagerTest.java
@@ -333,7 +333,7 @@ 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);