GD-Cert: Add btconfig parameter to real device test

* Pull config from device when done

Bug: 165828962
Test: gd/cert/run
Tag: #gd-refactor
Change-Id: Ic995f5767cdc94ba93d370037b7f1f32b97ceac2

diff --git a/gd/cert/android_devices_config.json b/gd/cert/android_devices_config.json
index 26c49d2..dde211e 100644 (file)
--- a/gd/cert/android_devices_config.json
+++ b/gd/cert/android_devices_config.json
@@ -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)"
                     ]
                 }

diff --git a/gd/cert/gd_device.py b/gd/cert/gd_device.py
index 3a84ffc..3018566 100644 (file)
--- a/gd/cert/gd_device.py
+++ b/gd/cert/gd_device.py
@@ -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)