Merge "Cert: set default snoop path for real device" am: d2afa6581b (9e68e645) · Commits · e / os / android_packages_modules_Bluetooth

system/gd/cert/android_devices_config.json

+4 −2

Original line number	Diff line number	Diff line
		@@ -19,7 +19,8 @@
		"shell",
		"/system/bin/stack_with_facade",
		"--grpc-port=$(grpc_port)",
		"--root-server-port=$(grpc_root_server_port)"
		"--root-server-port=$(grpc_root_server_port)",
		"--btsnoop=data/misc/bluetooth/logs/btsnoop_hci.log"
		]
		}
		],
		@@ -38,7 +39,8 @@
		"shell",
		"/system/bin/bluetooth_cert_stack",
		"--grpc-port=$(grpc_port)",
		"--root-server-port=$(grpc_root_server_port)"
		"--root-server-port=$(grpc_root_server_port)",
		"--btsnoop=data/misc/bluetooth/logs/btsnoop_hci.log"
		]
		}
		]

+5 −2

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		import logging
		import os
		from builtins import open
		import json
		import signal
		import socket
		import subprocess
		@@ -60,6 +61,8 @@ class GdDeviceBase:
		log_path_base, '%s_%s_backing_logs.txt' % (type_identifier, label))
		self.backing_process_logs = open(backing_process_logpath, 'w')

		cmd_str = json.dumps(cmd)
		if "--btsnoop=" not in cmd_str:
		btsnoop_path = os.path.join(log_path_base, '%s_btsnoop_hci.log' % label)
		cmd.append("--btsnoop=" + btsnoop_path)