[DO NOT MERGE ANYWHERE] Reset branch to aosp staging
Something went horribly wrong which results
in constant merge conflicts. This is an attempt
to fix this intermediate branch to avoid rediculous merge
conflicts in the future.
Change-Id: I52a3173658f9239166f5dbfaeae1be0f30649fd3
diff --git a/acts/tests/google/bt/test_tools/EnergyTest.py b/acts/tests/google/bt/test_tools/EnergyTest.py
index 24a48f3..663cefb 100644
--- a/acts/tests/google/bt/test_tools/EnergyTest.py
+++ b/acts/tests/google/bt/test_tools/EnergyTest.py
@@ -13,7 +13,6 @@
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations under
# the License.
-
"""
Continuously poll for energy info for a single Android Device
"""
@@ -24,17 +23,14 @@
class EnergyTest(BluetoothBaseTest):
-
def __init__(self, controllers):
BluetoothBaseTest.__init__(self, controllers)
- self.tests = (
- "test_continuous_energy_report",
- )
+ self.tests = ("test_continuous_energy_report", )
@BluetoothBaseTest.bt_test_wrap
def test_continuous_energy_report(self):
while (True):
with suppress(Exception):
- self.log.info(
- self.android_devices[0].droid.bluetoothGetControllerActivityEnergyInfo(1))
+ self.log.info(self.android_devices[
+ 0].droid.bluetoothGetControllerActivityEnergyInfo(1))
return True