commit 8b42ca8621ada4a8139d964e867725d04dc4ca16
author Benson Huang <benson.huang@mediatek.com> Thu Jun 26 17:42:10 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Jun 26 17:42:10 2014 +0000
tree 8951519ec7f5acae4916759c7df8bbdccef7c36f
parent f92d46c3eb8837ae36b2fe7319bc15421b7d58ad
parent 46fffb061940ff7e11560925ff95089919886480

am 46fffb06: Fix CTS testStartUsingNetworkFeature_enableHipri fail

* commit '46fffb061940ff7e11560925ff95089919886480':
  Fix CTS testStartUsingNetworkFeature_enableHipri fail

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

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