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

Merge remote branch 'goog/gingerbread' into manualmerge

Browse Source 
Conflicts:
	tests/expectations/knownfailures.txt

Change-Id: I9db887535ef970eef0209251460c13b367f23779
This commit is contained in:
Brian Muramatsu
2011-04-07 11:30:45 -07:00
parent e704a78bf7 f108edaa63
commit 4d2f2058dd
1 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tests/cts/net/src/android/net/wifi/cts/WifiInfoTest.java
View File

@@ -54,7 +54,7 @@ public class WifiInfoTest extends AndroidTestCase {
@Override @Override
public void onReceive(Context context, Intent intent) { public void onReceive(Context context, Intent intent) {
final String action = intent.getAction(); final String action = intent.getAction();
if (action.equals(WifiManager.SUPPLICANT_STATE_CHANGED_ACTION)) { if (action.equals(WifiManager.WIFI_STATE_CHANGED_ACTION)) {
synchronized (mMySync) { synchronized (mMySync) {
mMySync.expectedState = STATE_WIFI_CHANGED; mMySync.expectedState = STATE_WIFI_CHANGED;
mMySync.notify(); mMySync.notify();
@@ -68,14 +68,7 @@ public class WifiInfoTest extends AndroidTestCase {
super.setUp(); super.setUp();
mMySync = new MySync(); mMySync = new MySync();
mIntentFilter = new IntentFilter(); 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.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); mContext.registerReceiver(mReceiver, mIntentFilter);
mWifiManager = (WifiManager) getContext().getSystemService(Context.WIFI_SERVICE); mWifiManager = (WifiManager) getContext().getSystemService(Context.WIFI_SERVICE);