Snap for 10743636 from a0d4e807a527f622abdc63383915e7864046ec75 to mainline-wifi-releaseaml_wif_341110010

Change-Id: I7aedf8bc43b82ecd142c3885f67b99da76cf155b

1 files changed, 0 insertions, 34 deletions

diff --git a/avatar/pandora_server.py b/avatar/pandora_server.py
index be5e8b2..4fd56fb 100644
--- a/avatar/pandora_server.py
+++ b/avatar/pandora_server.py
@@ -19,11 +19,7 @@ import asyncio
 import avatar.aio
 import grpc
 import grpc.aio
-import logging
-import os
 import portpicker
-import re
-import shlex
 import threading
 import types
 
@@ -114,8 +110,6 @@ class AndroidPandoraServer(PandoraServer[AndroidDevice]):
 
     _instrumentation: Optional[threading.Thread] = None
     _port: int
-    _logger: logging.Logger
-    _handler: logging.Handler
 
     def start(self) -> PandoraClient:
         """Sets up and starts the Pandora server on the Android device."""
@@ -136,31 +130,6 @@ class AndroidPandoraServer(PandoraServer[AndroidDevice]):
         self._instrumentation.start()
         self.device.adb.forward([f'tcp:{self._port}', f'tcp:{ANDROID_SERVER_GRPC_PORT}'])  # type: ignore
 
-        # Forward all logging to ADB logs
-        adb = self.device.adb
-
-        class AdbLoggingHandler(logging.Handler):
-            def emit(self, record: logging.LogRecord) -> None:
-                if record.levelno <= logging.DEBUG:
-                    return
-                ansi_escape = re.compile(r'\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])')
-                msg = self.format(record)
-                msg = ansi_escape.sub('', msg)
-                level = {
-                    logging.FATAL: 'f',
-                    logging.ERROR: 'e',
-                    logging.WARN: 'w',
-                    logging.INFO: 'i',
-                    logging.DEBUG: 'd',
-                    logging.NOTSET: 'd',
-                }[record.levelno]
-                for msg in msg.splitlines():
-                    os.system(f'adb -s {adb.serial} shell "log -t Avatar -p {level} {shlex.quote(msg)}"')
-
-        self._logger = logging.getLogger()
-        self._handler = AdbLoggingHandler()
-        self._logger.addHandler(self._handler)
-
         return PandoraClient(f'localhost:{self._port}', 'android')
 
     def stop(self) -> None:
@@ -172,9 +141,6 @@ class AndroidPandoraServer(PandoraServer[AndroidDevice]):
             'shell', f'am force-stop {ANDROID_SERVER_PACKAGE}', shell=False, timeout=None, stderr=None
         )
 
-        # Remove ADB logging handler
-        self._logger.removeHandler(self._handler)
-
         self.device.adb.forward(['--remove', f'tcp:{self._port}'])  # type: ignore
         self._instrumentation.join()
         self._instrumentation = None