LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am 8b42ca86: am c893f50f: Fix CTS testStartUsingNetworkFeature_enableHipri fail

Browse Source 
* commit '8b42ca8621ada4a8139d964e867725d04dc4ca16':
  Fix CTS testStartUsingNetworkFeature_enableHipri fail
This commit is contained in:
Benson Huang
2014-06-26 17:48:36 +00:00
committed by Android Git Automerger
parent fd24c913c2 c893f50f6f
commit ad8f5b79a0
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
View File

@@ -272,9 +272,13 @@ public class ConnectivityManagerTest extends AndroidTestCase {
return; return;
} }
boolean isWifiConnected = mWifiManager.isWifiEnabled() boolean isWifiEnabled = mWifiManager.isWifiEnabled();
&& mWifiManager.getConnectionInfo().getSSID() != null; boolean isWifiConnected = false;
NetworkInfo nwInfo = mCm.getNetworkInfo(ConnectivityManager.TYPE_WIFI);
if (nwInfo != null) {
isWifiConnected = nwInfo.isConnected();
}
try { try {
// Make sure WiFi is connected to an access point. // Make sure WiFi is connected to an access point.
if (!isWifiConnected) { if (!isWifiConnected) {
@@ -308,7 +312,7 @@ public class ConnectivityManagerTest extends AndroidTestCase {
// TODO wait for HIPRI to go // TODO wait for HIPRI to go
// TODO check dns selection // TODO check dns selection
// TODO check routes // TODO check routes
if (!isWifiConnected) { if (!isWifiEnabled) {
mWifiManager.setWifiEnabled(false); mWifiManager.setWifiEnabled(false);
} }
} }