Use the existing property for fastboot mode instead.

google · Apr 20, 2023 · beb2f22 · beb2f22
1 parent e92e594
commit beb2f22
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/mobly/controllers/android_device.py b/mobly/controllers/android_device.py
@@ -874,10 +874,6 @@ def is_emulator(self):
     else:
       return False
 
-  @property
-  def is_fastboot(self):
-    return self.serial in list_fastboot_devices()
-
   def load_config(self, config):
     """Add attributes to the AndroidDevice object based on config.
 

diff --git a/mobly/controllers/android_device_lib/services/logcat.py b/mobly/controllers/android_device_lib/services/logcat.py
@@ -201,7 +201,7 @@ def start(self):
 
     The collection runs in a separate subprocess and saves logs in a file.
     """
-    if self._ad.is_fastboot:
+    if self._ad.is_bootloader:
       self._ad.log.warning(
           'Skip starting logcat because the device is in fastboot mode.')
       return

diff --git a/tests/mobly/controllers/android_device_test.py b/tests/mobly/controllers/android_device_test.py
@@ -585,7 +585,7 @@ def test_AndroidDevice_is_emulator_when_emulator_serial(
               return_value='1')
   def test_AndroidDevice_is_fastboot(self, _, MockFastboot, MockAdbProxy):
     ad = android_device.AndroidDevice(serial='1')
-    self.assertTrue(ad.is_fastboot)
+    self.assertTrue(ad.is_bootloader)
 
   @mock.patch('mobly.controllers.android_device_lib.adb.AdbProxy',
               return_value=mock_android_device.MockAdbProxy('1'))