From f108edaa630a5d808328fe892cba7ebbefb26ce0 Mon Sep 17 00:00:00 2001 From: Irfan Sheriff Date: Wed, 6 Apr 2011 10:21:51 -0700 Subject: [PATCH] Fix WifiInfoTest Do not listen to supplicant state change for wifi disable action, instead depend on wifi state changed action Bug: 4242273 Change-Id: Ie53ff42d5e51bbc9f28d93a435fa3315611d342e --- tests/cts/net/src/android/net/wifi/cts/WifiInfoTest.java | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/tests/cts/net/src/android/net/wifi/cts/WifiInfoTest.java b/tests/cts/net/src/android/net/wifi/cts/WifiInfoTest.java index 3b1a6c1ab3..44189cd13a 100644 --- a/tests/cts/net/src/android/net/wifi/cts/WifiInfoTest.java +++ b/tests/cts/net/src/android/net/wifi/cts/WifiInfoTest.java @@ -54,7 +54,7 @@ public class WifiInfoTest extends AndroidTestCase { @Override public void onReceive(Context context, Intent intent) { final String action = intent.getAction(); - if (action.equals(WifiManager.SUPPLICANT_STATE_CHANGED_ACTION)) { + if (action.equals(WifiManager.WIFI_STATE_CHANGED_ACTION)) { synchronized (mMySync) { mMySync.expectedState = STATE_WIFI_CHANGED; mMySync.notify(); @@ -68,14 +68,7 @@ public class WifiInfoTest extends AndroidTestCase { super.setUp(); mMySync = new MySync(); mIntentFilter = new IntentFilter(); - mIntentFilter.addAction(WifiManager.NETWORK_STATE_CHANGED_ACTION); - mIntentFilter.addAction(WifiManager.SCAN_RESULTS_AVAILABLE_ACTION); - mIntentFilter.addAction(WifiManager.SUPPLICANT_CONNECTION_CHANGE_ACTION); - mIntentFilter.addAction(WifiManager.SUPPLICANT_STATE_CHANGED_ACTION); mIntentFilter.addAction(WifiManager.WIFI_STATE_CHANGED_ACTION); - mIntentFilter.addAction(WifiManager.RSSI_CHANGED_ACTION); - mIntentFilter.addAction(WifiManager.NETWORK_IDS_CHANGED_ACTION); - mIntentFilter.addAction(WifiManager.ACTION_PICK_WIFI_NETWORK); mContext.registerReceiver(mReceiver, mIntentFilter); mWifiManager = (WifiManager) getContext().getSystemService(Context.WIFI_SERVICE);