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

Commit 7d390220 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "GD-Cert: Add btconfig parameter to real device test" am: eaa14651 

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1412291

Change-Id: If0326104175380e7e22678a7b9ddb26b2fd13f58
parents 636cd604 eaa14651

system/gd/cert/android_devices_config.json

+4 −2
Original line number Diff line number Diff line
@@ -22,7 +22,8 @@ 
                        "/system/bin/bluetooth_stack_with_facade",

                        "--grpc-port=$(grpc_port)",

                        "--root-server-port=$(grpc_root_server_port)",

                        "--btsnoop=data/misc/bluetooth/logs/btsnoop_hci.log",

                        "--btsnoop=/data/misc/bluetooth/logs/btsnoop_hci.log",

                        "--btconfig=/data/misc/bluedroid/bt_config.conf",

                        "--signal-port=$(signal_port)"

                    ]

                },
@@ -42,7 +43,8 @@ 
                        "/system/bin/bluetooth_stack_with_facade",

                        "--grpc-port=$(grpc_port)",

                        "--root-server-port=$(grpc_root_server_port)",

                        "--btsnoop=data/misc/bluetooth/logs/btsnoop_hci.log",

                        "--btsnoop=/data/misc/bluetooth/logs/btsnoop_hci.log",

                        "--btconfig=/data/misc/bluedroid/bt_config.conf",

                        "--signal-port=$(signal_port)"

                    ]

                }

system/gd/cert/gd_device.py

+6 −0
Original line number Diff line number Diff line
@@ -412,6 +412,8 @@ class GdAndroidDevice(GdDeviceBase): 
        self.push_or_die(os.path.join(get_gd_root(), "target", "libbluetooth_gd.so"), "system/lib64")

        self.push_or_die(os.path.join(get_gd_root(), "target", "libgrpc++_unsecure.so"), "system/lib64")

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

        self.adb.shell("rm /data/misc/bluedroid/bt_config.conf")

        self.adb.shell("rm /data/misc/bluedroid/bt_config.bak")

        self.ensure_no_output(self.adb.shell("svc bluetooth disable"))



        # Start logcat logging
@@ -457,6 +459,10 @@ class GdAndroidDevice(GdDeviceBase): 
        self.cleanup_port_forwarding()

        self.adb.pull("/data/misc/bluetooth/logs/btsnoop_hci.log %s" % os.path.join(self.log_path_base,

                                                                                    "%s_btsnoop_hci.log" % self.label))

        self.adb.pull("/data/misc/bluedroid/bt_config.conf %s" % os.path.join(self.log_path_base,

                                                                              "%s_bt_config.conf" % self.label))

        self.adb.pull(

            "/data/misc/bluedroid/bt_config.bak %s" % os.path.join(self.log_path_base, "%s_bt_config.bak" % self.label))



    def cleanup_port_forwarding(self):

        self.adb.remove_tcp_forward(self.grpc_port)