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

Merge "Merge remote branch 'korg/froyo' into manualmerge" into gingerbread

Browse Source
This commit is contained in:
Brian Muramatsu
2011-01-20 15:19:16 -08:00
committed by Android Code Review
parent 9b7ea4afac cda6b3d881
commit 10cf2ff3ef
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,7 +20,6 @@ import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetClass; import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestTargetNew; import dalvik.annotation.TestTargetNew;
import dalvik.annotation.TestTargets; import dalvik.annotation.TestTargets;
import dalvik.annotation.ToBeFixed;
import android.content.BroadcastReceiver; import android.content.BroadcastReceiver;
import android.content.Context; import android.content.Context;
@@ -168,8 +167,6 @@ public class WifiInfoTest extends AndroidTestCase {
args = {} args = {}
) )
}) })
@ToBeFixed(bug="1871573", explanation="android.net.wifi.WifiInfo#getNetworkId() return -1 when"
+ " there is wifi connection")
public void testWifiInfoProperties() throws Exception { public void testWifiInfoProperties() throws Exception {
// this test case should in Wifi environment // this test case should in Wifi environment
WifiInfo wifiInfo = mWifiManager.getConnectionInfo(); WifiInfo wifiInfo = mWifiManager.getConnectionInfo();
@@ -189,6 +186,7 @@ public class WifiInfoTest extends AndroidTestCase {
Thread.sleep(DURATION); Thread.sleep(DURATION);
wifiInfo = mWifiManager.getConnectionInfo(); wifiInfo = mWifiManager.getConnectionInfo();
assertEquals(-1, wifiInfo.getNetworkId()); assertEquals(-1, wifiInfo.getNetworkId());
assertEquals(WifiManager.WIFI_STATE_DISABLED, mWifiManager.getWifiState());
} }
} }