commit 51d1bb826b97af9d0fc74e8c515622673db0a892
author Julien Desprez <jdesprez@google.com> Wed Apr 01 22:46:11 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Apr 01 22:46:11 2020 +0000
tree 4fe1dcec19b7e6be4b2f3efe16c9aa83b7dceb83
parent c775232a6d9b5cb97797ebfa053dcb66469717f1
parent 062a7dfcf124707723f88246eb1b86b24bb3d3c0

Merge "Ensure we check all the results for the files"

src/com/android/tradefed/device/recovery/BatteryRechargeDeviceRecovery.java

diff --git a/src/com/android/tradefed/device/recovery/BatteryRechargeDeviceRecovery.java b/src/com/android/tradefed/device/recovery/BatteryRechargeDeviceRecovery.java
index 85e4df0..fb268a0 100644
--- a/src/com/android/tradefed/device/recovery/BatteryRechargeDeviceRecovery.java
+++ b/src/com/android/tradefed/device/recovery/BatteryRechargeDeviceRecovery.java
@@ -36,7 +36,8 @@
             return true;
         }
         Integer level = device.getBattery();
-        if (level == null || level >= mMinBattery) {
+        // Skip zero battery since some devices use that as 'no-battery'
+        if (level == null || level == 0 || level >= mMinBattery) {
             return true;
         }
         return false;