commit 3ba0298555e9b2c1a760deae9b7ad5737721e83f
author Julien Desprez <jdesprez@google.com> Thu Apr 02 23:31:56 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Apr 02 23:31:56 2020 +0000
tree 15e409e5291655dd9b1e2ed1f52d29fd5b1f910f
parent 99c571a9f60f99a6f5076748bd9ea2123646f3dd
parent 8cb12d7ba9d757ea7ef76b6e87b80962f2e49f8b

Merge "Ensure we restart runtime if stopped"

src/com/android/tradefed/testtype/DeviceBatteryLevelChecker.java

diff --git a/src/com/android/tradefed/testtype/DeviceBatteryLevelChecker.java b/src/com/android/tradefed/testtype/DeviceBatteryLevelChecker.java
index f097786..14f8e78 100644
--- a/src/com/android/tradefed/testtype/DeviceBatteryLevelChecker.java
+++ b/src/com/android/tradefed/testtype/DeviceBatteryLevelChecker.java
@@ -92,6 +92,11 @@
         mTestDevice.executeShellCommand("stop");
     }
 
+    private void startDeviceRuntime() throws DeviceNotAvailableException {
+        mTestDevice.executeShellCommand("start");
+        mTestDevice.waitForDeviceAvailable();
+    }
+
     /** {@inheritDoc} */
     @Override
     public void run(TestInformation testInfo, ITestInvocationListener listener)
@@ -171,6 +176,12 @@
             }
             batteryLevel = newLevel;
         }
+
+        if (mStopRuntime) {
+            // Restart runtime if it was stopped
+            startDeviceRuntime();
+        }
+
         CLog.w("Device %s is now charged to battery level %d; releasing.",
                 mTestDevice.getSerialNumber(), batteryLevel);
     }