Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 954d7e55 authored by Hansong Zhang's avatar Hansong Zhang
Browse files

DeviceCert: Fix some setup/cleanup 

Always set time, disable Bluetooth; always pull logs

Test: cert/run_device_cert.sh
Change-Id: Id826d704b27b991740adb3eb7a2080d104fd2696
parent b690f629

system/gd/cert/gd_device_base.py

+3 −2
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ class GdDeviceBase: 
        self.serial_number = serial_number

        if self.serial_number:

            self.ad = AdbProxy(serial_number)

            self.ad.date(time.strftime("%m%d%H%M%Y.%S"))

            self.ad.shell("date " + time.strftime("%m%d%H%M%Y.%S"))

            self.ad.tcp_forward(int(grpc_port), int(grpc_port))

            self.ad.tcp_forward(

                int(grpc_root_server_port), int(grpc_root_server_port))
@@ -97,6 +97,7 @@ class GdDeviceBase: 
                "system/lib64")

            self.ad.shell("logcat -c")

            self.ad.shell("rm /data/misc/bluetooth/logs/btsnoop_hci.log")

            self.ad.shell("svc bluetooth disable")



        tester_signal_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)

        tester_signal_socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR,
@@ -129,7 +130,7 @@ class GdDeviceBase: 
        if backing_process_return_code not in [-stop_signal, 0]:

            logging.error("backing process %s stopped with code: %d" %

                          (self.label, backing_process_return_code))

            return False



        if self.serial_number:

            self.ad.shell("logcat -d -f /data/misc/bluetooth/logs/system_log")

            self.ad.pull(