commit ad8f5b79a042a333536e35528a18dff5e9f6d119
author Benson Huang <benson.huang@mediatek.com> Thu Jun 26 17:48:36 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Jun 26 17:48:36 2014 +0000
tree e957e539159a6c83715f3ed51d0deafaa4045bc7
parent fd24c913c286c24c535f8ff4283275be84a0b9bb
parent c893f50f6f995cf2bb866eea22beede36881e20e

am 8b42ca86: am c893f50f: Fix CTS testStartUsingNetworkFeature_enableHipri fail

* commit '8b42ca8621ada4a8139d964e867725d04dc4ca16':
  Fix CTS testStartUsingNetworkFeature_enableHipri fail

tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java

diff --git a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
index adb2b3a..5656119 100644
--- a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
+++ b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
@@ -272,9 +272,13 @@
             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) {
@@ -308,7 +312,7 @@
             // TODO wait for HIPRI to go
             // TODO check dns selection
             // TODO check routes
-            if (!isWifiConnected) {
+            if (!isWifiEnabled) {
                 mWifiManager.setWifiEnabled(false);
             }
         }