commit e90f1d7bc4fc8b0738f60edd7b7e3862c25fa21c
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Aug 01 03:00:04 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Aug 01 03:00:04 2024 +0000
tree d225511b38c4d0a47e61e819f05e15dbb940def5
parent f116ee16276073ddf5c196cbaafaad896e62eeca
parent e2b447035ea056611b229bb0b56afae7e688e333

Merge "Mark cleanedUp volatile since finalizer runs on any thread" into main

tests/cts/net/util/java/android/net/cts/util/EthernetTestInterface.kt

diff --git a/tests/cts/net/util/java/android/net/cts/util/EthernetTestInterface.kt b/tests/cts/net/util/java/android/net/cts/util/EthernetTestInterface.kt
index a93430c..b06245b 100644
--- a/tests/cts/net/util/java/android/net/cts/util/EthernetTestInterface.kt
+++ b/tests/cts/net/util/java/android/net/cts/util/EthernetTestInterface.kt
@@ -29,6 +29,7 @@
 import android.util.Log
 import com.android.net.module.util.ArrayTrackRecord
 import com.android.testutils.runAsShell
+import kotlin.concurrent.Volatile
 import kotlin.test.assertNotNull
 
 private const val TAG = "EthernetTestInterface"
@@ -77,7 +78,7 @@
     val name get() = testIface.interfaceName
     private val listener = EthernetStateListener(name)
     private val em = context.getSystemService(EthernetManager::class.java)!!
-    private var cleanedUp = false
+    @Volatile private var cleanedUp = false
 
     init{
         em.addInterfaceStateListener(handler::post, listener)