From 166e83cd7a7cdb84b4334cc683510031599abe82 Mon Sep 17 00:00:00 2001
From: David Su <dysu@google.com>
Date: Tue, 12 Nov 2019 18:53:24 -0800
Subject: [PATCH] Rename WifiSsid.NONE to WifiManager.UNKNOWN_SSID

Bug: 144311098
Test: compiles
Change-Id: I8235c909c6b99e5a5e2adcf4c2a364ebd8faf913
---
 tests/cts/net/src/android/net/wifi/cts/WifiInfoTest.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

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 9d9b2a3902..d9432315a2 100644
--- a/tests/cts/net/src/android/net/wifi/cts/WifiInfoTest.java
+++ b/tests/cts/net/src/android/net/wifi/cts/WifiInfoTest.java
@@ -25,7 +25,6 @@ import android.net.wifi.SupplicantState;
 import android.net.wifi.WifiInfo;
 import android.net.wifi.WifiManager;
 import android.net.wifi.WifiManager.WifiLock;
-import android.net.wifi.WifiSsid;
 import android.platform.test.annotations.AppModeFull;
 import android.test.AndroidTestCase;
 
@@ -132,7 +131,7 @@ public class WifiInfoTest extends AndroidTestCase {
         SupplicantState.isValidState(wifiInfo.getSupplicantState());
         WifiInfo.getDetailedStateOf(SupplicantState.DISCONNECTED);
         String ssid = wifiInfo.getSSID();
-        if (!ssid.startsWith("0x") && !ssid.equals(WifiSsid.NONE)) {
+        if (!ssid.startsWith("0x") && !ssid.equals(WifiManager.UNKNOWN_SSID)) {
             // Non-hex string should be quoted
             assertTrue(ssid.charAt(0) == '"');
             assertTrue(ssid.charAt(ssid.length() - 1) == '"');