Only disable wifi when ssid is set

Change-Id: I9e2c7b3665805d0ef4669a1cb63688c154260f9c

1 files changed, 3 insertions, 1 deletions

diff --git a/src/com/android/tradefed/targetprep/DeviceSetup2.java b/src/com/android/tradefed/targetprep/DeviceSetup2.java
index e6c2cd679..d93a65cd0 100644
--- a/src/com/android/tradefed/targetprep/DeviceSetup2.java
+++ b/src/com/android/tradefed/targetprep/DeviceSetup2.java
@@ -357,7 +357,9 @@ public class DeviceSetup2 implements ITargetPreparer, ITargetCleaner {
             return;
         }
 
-        if (mDisconnectWifiAfterTest && device.isWifiEnabled()) {
+        // Only try to disconnect if wifi ssid is set since isWifiEnabled() is a heavy operation
+        // which should be avoided when possible
+        if (mDisconnectWifiAfterTest && mWifiSsid != null && device.isWifiEnabled()) {
             boolean result = device.disconnectFromWifi();
             if (result) {
                 CLog.i("Successfully disconnected from wifi network on %s",