commit e1794e1518641f56ac661483477c4ece6e6f5294
author Roshan Pius <rpius@google.com> Wed Sep 07 17:52:09 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Sep 07 17:52:09 2016 +0000
tree 1cad60bcfd252f20c7ff425974b1e397001f82f2
parent 40a4a76824599d4095d34d87b85746ecdbb15081
parent f1bb48635dfbed57d74c342942eff50a207610eb

Merge "CtsNetTests: Fix WifiInfoTest" am: 133d0c3dad
am: b75c380c17

Change-Id: I62e56e6c6862eb15e2e86c88b1c3ba6f804291b6

tests/cts/net/src/android/net/wifi/cts/WifiInfoTest.java

diff --git a/tests/cts/net/src/android/net/wifi/cts/WifiInfoTest.java b/tests/cts/net/src/android/net/wifi/cts/WifiInfoTest.java
index 8719b6b..696d215 100644
--- a/tests/cts/net/src/android/net/wifi/cts/WifiInfoTest.java
+++ b/tests/cts/net/src/android/net/wifi/cts/WifiInfoTest.java
@@ -26,6 +26,7 @@
 import android.net.wifi.WifiInfo;
 import android.net.wifi.WifiManager;
 import android.net.wifi.WifiManager.WifiLock;
+import android.net.wifi.WifiSsid;
 import android.test.AndroidTestCase;
 
 import java.util.concurrent.Callable;
@@ -123,7 +124,7 @@
         SupplicantState.isValidState(wifiInfo.getSupplicantState());
         WifiInfo.getDetailedStateOf(SupplicantState.DISCONNECTED);
         String ssid = wifiInfo.getSSID();
-        if (ssid.startsWith("0x") == false) {
+        if (!ssid.startsWith("0x") && !ssid.equals(WifiSsid.NONE)) {
             // Non-hex string should be quoted
             assertTrue(ssid.charAt(0) == '"');
             assertTrue(ssid.charAt(ssid.length() - 1) == '"');