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

Commit 49ecd26e authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Set up ports after verity check for real device setup" am: a94ca57a... 

Merge "Set up ports after verity check for real device setup" am: a94ca57a am: 0227c047 am: 8825e377 am: fa0c17eb am: 6f9f6bf5

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

Change-Id: Ieb52446b42a6584c4385ef929305dbaa0acab923
parents c361174f 6f9f6bf5

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

+1 −1
Original line number Diff line number Diff line
@@ -226,6 +226,7 @@ class GdAndroidDevice(GdDeviceBase): 
    def setup(self):

        logging.info("Setting up device %s %s" % (self.label, self.serial_number))

        asserts.assert_true(self.adb.ensure_root(), "device %s cannot run as root", self.serial_number)

        self.ensure_verity_disabled()



        # Try freeing ports and ignore results

        self.cleanup_port_forwarding()
@@ -237,7 +238,6 @@ class GdAndroidDevice(GdDeviceBase): 
        self.tcp_reverse_or_die(self.signal_port, self.signal_port)



        # Push test binaries

        self.ensure_verity_disabled()

        self.push_or_die(os.path.join(get_gd_root(), "target", "bluetooth_stack_with_facade"), "system/bin")

        self.push_or_die(

            os.path.join(get_gd_root(), "target", "android.system.suspend.control-V1-ndk.so"), "system/lib64")

system/gd/cert/gd_device.py

+1 −1
Original line number Diff line number Diff line
@@ -229,6 +229,7 @@ class GdAndroidDevice(GdDeviceBase): 
    def setup(self):

        logging.info("Setting up device %s %s" % (self.label, self.serial_number))

        asserts.assert_true(self.adb.ensure_root(), "device %s cannot run as root", self.serial_number)

        self.ensure_verity_disabled()



        # Try freeing ports and ignore results

        self.cleanup_port_forwarding()
@@ -240,7 +241,6 @@ class GdAndroidDevice(GdDeviceBase): 
        self.tcp_reverse_or_die(self.signal_port, self.signal_port)



        # Push test binaries

        self.ensure_verity_disabled()

        self.push_or_die(os.path.join(get_gd_root(), "target", "bluetooth_stack_with_facade"), "system/bin")

        self.push_or_die(

            os.path.join(get_gd_root(), "target", "android.system.suspend.control-V1-ndk.so"), "system/lib64")