| commit | 3544f634bfccd138adb9a2210650af46009f932d | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Thu Aug 01 03:33:28 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Aug 01 03:33:28 2024 +0000 |
| tree | c4f2a94432a05dd367e46d852d606495fbdc9462 | |
| parent | ae37cc3beb4117ecc12bd88f67da676b0d2def0d [diff] | |
| parent | 601c1d932016ea6d8050510b99448fcb1e0de84d [diff] |
Merge "Mark cleanedUp volatile since finalizer runs on any thread" into main am: e90f1d7bc4 am: 601c1d9320 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3201939 Change-Id: I8ae76d778832bec1b9d63d391b2487b4fad3b79f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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)