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

Commit d27a7e94 authored by Jizheng Chu's avatar Jizheng Chu Committed by Automerger Merge Worker
Browse files

Merge "Fix bt disable cmd in gd device set up" am: fe29ebec 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2043705



Change-Id: I8f6cc822c765275ed2e4d3cd8d0a52a8776185f2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7a734933 fe29ebec

system/blueberry/tests/gd/cert/gd_device.py

+3 −1
Original line number Diff line number Diff line
@@ -527,7 +527,9 @@ class GdAndroidDevice(GdDeviceBase): 


        # Ensure Bluetooth is disabled

        self.ensure_no_output(self.adb.shell("settings put global ble_scan_always_enabled 0"))

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

        self.adb.shell("cmd bluetooth_manager disable")

        device_bt_state = int(self.adb.shell("settings get global bluetooth_on"))

        asserts.assert_equal(device_bt_state, 0, "Failed to disable Bluetooth on device %s %s" % (self.label, self.serial_number))

        logging.info("Bluetooth disabled on device %s %s" % (self.label, self.serial_number))



        # Start logcat logging