commit b15bb50e76736bc20ebf9faa283fd5d2e59ef1eb
author Julien Desprez <jdesprez@google.com> Thu Oct 21 10:58:54 2021 -0700
committer Treehugger Robot <treehugger-gerrit@google.com> Mon Oct 25 17:03:11 2021 +0000
tree 766c664f92f37ae3392847ad2ff663864ab65712
parent 6a38fea5bd31479fa1ca9da6cba6e6ad5613e1de

Use atomic int to update in thread

Test: unit tests
Bug: 187837493
Change-Id: I260aecd8a7fa1a14fde096e0eb726f81544890cb

javatests/com/android/tradefed/device/TestDeviceTest.java

diff --git a/javatests/com/android/tradefed/device/TestDeviceTest.java b/javatests/com/android/tradefed/device/TestDeviceTest.java
index 3fc643f..2b6e476 100644
--- a/javatests/com/android/tradefed/device/TestDeviceTest.java
+++ b/javatests/com/android/tradefed/device/TestDeviceTest.java
@@ -91,6 +91,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
 
 import javax.annotation.Nullable;
 
@@ -4007,11 +4008,11 @@
     public void testSwitchUser_delay_api30() throws Exception {
         mTestDevice =
                 new TestableTestDevice() {
-                    int ret = 0;
+                    AtomicInteger ret = new AtomicInteger(0);
 
                     @Override
                     public int getCurrentUser() throws DeviceNotAvailableException {
-                        return ret;
+                        return ret.get();
                     }
 
                     @Override
@@ -4057,7 +4058,7 @@
                                         @Override
                                         public void run() {
                                             RunUtil.getDefault().sleep(100);
-                                            ret = 10;
+                                            ret.set(10);
                                         }
                                     });
                 };