From c893f50f6f995cf2bb866eea22beede36881e20e Mon Sep 17 00:00:00 2001 From: Benson Huang Date: Wed, 25 Jun 2014 15:02:11 +0800 Subject: [PATCH] Fix CTS testStartUsingNetworkFeature_enableHipri fail The return value of mWifiManager.isWifiEnabled() && mWifiManager.getConnectionInfo().getSSID() != null can not correctly identify if WiFi is connected or not. The fix is to modify the code logic used to judge if WiFi is connected. Bug 15578218 and 15578219 Change-Id: I8ae40980c9cd1ea91dafe0ca7c893c84b35709bf Signed-off-by: Benson Huang --- .../src/android/net/cts/ConnectivityManagerTest.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java index 6f67ed99ea..e769be19ae 100644 --- a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java +++ b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java @@ -269,9 +269,13 @@ public class ConnectivityManagerTest extends AndroidTestCase { return; } - boolean isWifiConnected = mWifiManager.isWifiEnabled() - && mWifiManager.getConnectionInfo().getSSID() != null; + boolean isWifiEnabled = mWifiManager.isWifiEnabled(); + boolean isWifiConnected = false; + NetworkInfo nwInfo = mCm.getNetworkInfo(ConnectivityManager.TYPE_WIFI); + if (nwInfo != null) { + isWifiConnected = nwInfo.isConnected(); + } try { // Make sure WiFi is connected to an access point. if (!isWifiConnected) { @@ -305,7 +309,7 @@ public class ConnectivityManagerTest extends AndroidTestCase { // TODO wait for HIPRI to go // TODO check dns selection // TODO check routes - if (!isWifiConnected) { + if (!isWifiEnabled) { mWifiManager.setWifiEnabled(false); } }