From 4672203ea119f38786f55ac866f38da307671a49 Mon Sep 17 00:00:00 2001
From: Xia Wang <xiaw@google.com>
Date: Thu, 6 May 2010 14:12:54 -0700
Subject: [PATCH] Avoid UNKNOWN state for Wifi in bug2542613, not a common user
 case.

Change-Id: Ief0a953e2909cb5c808f0d683ab95d14f6c53e72
---
 .../functional/ConnectivityManagerMobileTest.java        | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/functional/ConnectivityManagerMobileTest.java b/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/functional/ConnectivityManagerMobileTest.java
index ae3daad6dd43c..cdaefc8530790 100644
--- a/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/functional/ConnectivityManagerMobileTest.java
+++ b/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/functional/ConnectivityManagerMobileTest.java
@@ -150,6 +150,15 @@ public class ConnectivityManagerMobileTest
     // Test case 1: Test enabling Wifi without associating with any AP
     @LargeTest
     public void test3GToWifiNotification() {
+        // To avoid UNKNOWN state when device boots up
+        cmActivity.enableWifi();
+        try {
+            Thread.sleep(2 * STATE_TRANSITION_SHORT_TIMEOUT);
+        } catch (Exception e) {
+            Log.v(LOG_TAG, "exception: " + e.toString());
+        }
+
+        cmActivity.disableWifi();
         // As Wifi stays in DISCONNECTED, the connectivity manager will not broadcast
         // any network connectivity event for Wifi
         NetworkInfo networkInfo = cmActivity.mCM.getNetworkInfo(ConnectivityManager.TYPE_MOBILE);