commit 6445de09dda32f7606029018b0351e314203a423
author Julien Desprez <jdesprez@google.com> Wed Feb 03 11:04:52 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Feb 03 11:04:52 2016 +0000
tree 79575a1bf3dff0fc02e877dbc608670fba4e6b57
parent 51c78c20113d79b66a15204a17c928fe6de7e40e
parent 8f2943cff4929d7c0b5eb9fbc217152aee9952db

Merge "Fix the companion device state when unavailable"

src/com/android/tradefed/targetprep/companion/CompanionDeviceTracker.java

diff --git a/src/com/android/tradefed/targetprep/companion/CompanionDeviceTracker.java b/src/com/android/tradefed/targetprep/companion/CompanionDeviceTracker.java
index 6107460..0d9b690 100644
--- a/src/com/android/tradefed/targetprep/companion/CompanionDeviceTracker.java
+++ b/src/com/android/tradefed/targetprep/companion/CompanionDeviceTracker.java
@@ -22,6 +22,7 @@
 import com.android.tradefed.device.FreeDeviceState;
 import com.android.tradefed.device.IDeviceManager;
 import com.android.tradefed.device.ITestDevice;
+import com.android.tradefed.device.TestDeviceState;
 import com.android.tradefed.log.LogUtil.CLog;
 
 import java.util.HashMap;
@@ -84,7 +85,12 @@
             return;
         }
         ITestDevice companion = mDeviceMapping.remove(device);
-        getDeviceManager().freeDevice(companion, FreeDeviceState.AVAILABLE);
+        FreeDeviceState deviceState = FreeDeviceState.AVAILABLE;
+        if (!TestDeviceState.ONLINE.equals(companion.getDeviceState())) {
+            //If the device is offline at the end of the test
+            deviceState = FreeDeviceState.UNAVAILABLE;
+        }
+        getDeviceManager().freeDevice(companion, deviceState);
         CLog.i("freed companion device %s for primary device %s",
                 companion.getSerialNumber(), device.getSerialNumber());
     }