From 675b8197a3f970b1b3c0ed52baa0a304ee7ae873 Mon Sep 17 00:00:00 2001 From: Liam Miller-Cushon Date: Fri, 9 Oct 2026 15:31:04 -0700 Subject: [PATCH] Automated Code Change PiperOrigin-RevId: 996795912 --- .../shellexecutor/ShellCommandLocalSocketExecutorServer.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/services/shellexecutor/java/androidx/test/services/shellexecutor/ShellCommandLocalSocketExecutorServer.kt b/services/shellexecutor/java/androidx/test/services/shellexecutor/ShellCommandLocalSocketExecutorServer.kt index 775f81d89..359493045 100644 --- a/services/shellexecutor/java/androidx/test/services/shellexecutor/ShellCommandLocalSocketExecutorServer.kt +++ b/services/shellexecutor/java/androidx/test/services/shellexecutor/ShellCommandLocalSocketExecutorServer.kt @@ -32,6 +32,7 @@ import java.util.concurrent.Executors import java.util.concurrent.atomic.AtomicBoolean import kotlin.time.Duration import kotlin.time.Duration.Companion.milliseconds +import kotlinx.coroutines.CompletableJob import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Job import kotlinx.coroutines.SupervisorJob @@ -59,7 +60,7 @@ constructor( // Since LocalServerSocket.accept() has to be interrupted, we keep that in its own Job... lateinit var serverJob: Job // ...while all the child jobs are under a single SupervisorJob that we can join later. - val shellJobs = SupervisorJob() + val shellJobs: CompletableJob = SupervisorJob() val running = AtomicBoolean(true) /** Returns the binder key to pass to client processes. */