From c429d8ea48ff65fe8bf7ff1832773d73a8f944df Mon Sep 17 00:00:00 2001
From: DeepMind <copybara-servicebot@google.com>
Date: Fri, 11 Apr 2025 05:56:14 -0700
Subject: [PATCH] Wrap TaskManager clean up procedure in try-catch to prevent
 an error crashing clean up process.

PiperOrigin-RevId: 746428570
---
 android_env/components/task_manager.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/android_env/components/task_manager.py b/android_env/components/task_manager.py
index 81718546..9bdbb568 100644
--- a/android_env/components/task_manager.py
+++ b/android_env/components/task_manager.py
@@ -241,7 +241,10 @@ def _start_dumpsys_thread(self,
 
   def _stop_logcat_thread(self):
     if self._logcat_thread is not None:
-      self._logcat_thread.kill()
+      try:
+        self._logcat_thread.kill()
+      except Exception as e:  # pylint: disable=broad-except
+        logging.warning('Failed to kill logcat thread: %r', e)
       self._logcat_thread = None
 
   def _increment_bad_state(self) -> None: