When running on Virtual device avoid logging the battery
Virtual devices have no battery, so avoid logging the
fake battery results.
Test: unit tests
Bug: 132997631
Change-Id: Ideb57c127d57c7c70658dc7a00bbf230eec483f8
diff --git a/remote/.classpath b/remote/.classpath
index b59b5c8..74e2efb 100644
--- a/remote/.classpath
+++ b/remote/.classpath
@@ -10,7 +10,6 @@
<classpathentry exported="true" kind="var" path="TRADEFED_ROOT/prebuilts/misc/common/sdklib/sdklib-prebuilt.jar"/>
<classpathentry exported="true" kind="var" path="TRADEFED_ROOT/prebuilts/misc/common/tools-common/tools-common-prebuilt.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/ddmlib"/>
- <classpathentry kind="var" path="TRADEFED_ROOT/out/soong/.intermediates/external/guava/guava/linux_glibc_common/combined/guava.jar"/>
<classpathentry kind="var" path="TRADEFED_ROOT/external/error_prone/error_prone/error_prone_annotations-2.3.2.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/src/com/android/tradefed/invoker/TestInvocation.java b/src/com/android/tradefed/invoker/TestInvocation.java
index 6a31ff5..0180930 100644
--- a/src/com/android/tradefed/invoker/TestInvocation.java
+++ b/src/com/android/tradefed/invoker/TestInvocation.java
@@ -28,6 +28,8 @@
import com.android.tradefed.device.StubDevice;
import com.android.tradefed.device.TestDeviceState;
import com.android.tradefed.device.cloud.ManagedRemoteDevice;
+import com.android.tradefed.device.cloud.NestedRemoteDevice;
+import com.android.tradefed.device.cloud.RemoteAndroidVirtualDevice;
import com.android.tradefed.guice.InvocationScope;
import com.android.tradefed.invoker.sandbox.ParentSandboxInvocationExecution;
import com.android.tradefed.invoker.sandbox.SandboxedInvocationExecution;
@@ -526,6 +528,11 @@
if (testDevice.getIDevice() instanceof StubDevice) {
continue;
}
+ if (testDevice instanceof RemoteAndroidVirtualDevice
+ || testDevice instanceof NestedRemoteDevice) {
+ // Vritual devices have a fake battery there is no point in logging it.
+ continue;
+ }
Integer batteryLevel = testDevice.getBattery();
if (batteryLevel == null) {
CLog.v("Failed to get battery level for %s", testDevice.getSerialNumber());
