diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-04-26 23:01:47 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-04-26 23:01:47 +0000 |
| commit | 2d16a54443132e4411b880aba69e4dafc58735f0 (patch) | |
| tree | 03c37868d32720c0976a6b604ad32b671e8605b5 | |
| parent | 4f36bc45ca97f21eba19e0ae3e6f8a1768841e11 (diff) | |
| parent | 7d26ddf5bab98e85684218414bc02321b7d3eed0 (diff) | |
| download | development-2d16a54443132e4411b880aba69e4dafc58735f0.tar.gz | |
Snap for 10017950 from 7d26ddf5bab98e85684218414bc02321b7d3eed0 to udc-release
Change-Id: Ie2a0c48b233d4d02cff866a73b62814e7010f654
| -rw-r--r-- | tools/winscope/src/adb/winscope_proxy.py | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/tools/winscope/src/adb/winscope_proxy.py b/tools/winscope/src/adb/winscope_proxy.py index c0a2f750e..5fbe58f58 100644 --- a/tools/winscope/src/adb/winscope_proxy.py +++ b/tools/winscope/src/adb/winscope_proxy.py @@ -646,10 +646,15 @@ echo "TRACE_START" > /data/local/tmp/winscope_status # Do not print anything to stdout/stderr in the handler function stop_trace() {{ - trap - EXIT HUP INT + echo "start" >/data/local/tmp/winscope_signal_handler.log -{} + # redirect stdout/stderr to log file + exec 1>>/data/local/tmp/winscope_signal_handler.log + exec 2>>/data/local/tmp/winscope_signal_handler.log + set -x + trap - EXIT HUP INT + {} echo "TRACE_OK" > /data/local/tmp/winscope_status }} @@ -695,8 +700,18 @@ class EndTrace(DeviceRequestEndpoint): TRACE_THREADS[device_id].end_trace() success = TRACE_THREADS[device_id].success() - out = TRACE_THREADS[device_id].out + \ - b"\n" + TRACE_THREADS[device_id].err + + signal_handler_log = call_adb("shell su root cat /data/local/tmp/winscope_signal_handler.log", device=device_id).encode('utf-8') + + out = b"### Shell script's stdout - start\n" + \ + TRACE_THREADS[device_id].out + \ + b"### Shell script's stdout - end\n" + \ + b"### Shell script's stderr - start\n" + \ + TRACE_THREADS[device_id].err + \ + b"### Shell script's stderr - end\n" + \ + b"### Signal handler log - start\n" + \ + signal_handler_log + \ + b"### Signal handler log - end\n" command = TRACE_THREADS[device_id].trace_command TRACE_THREADS.pop(device_id) if success: |