Merge "Merge remote branch 'korg/froyo' into froyomerge" into gingerbread
This commit is contained in:
@@ -16,8 +16,6 @@
|
||||
|
||||
package android.net.cts;
|
||||
|
||||
import com.android.internal.telephony.Phone;
|
||||
|
||||
import dalvik.annotation.TestLevel;
|
||||
import dalvik.annotation.TestTargetClass;
|
||||
import dalvik.annotation.TestTargetNew;
|
||||
@@ -233,7 +231,7 @@ public class ConnectivityManagerTest extends AndroidTestCase {
|
||||
fail("Broadcast receiver waiting for ConnectivityManager interrupted.");
|
||||
} finally {
|
||||
mCm.stopUsingNetworkFeature(ConnectivityManager.TYPE_MOBILE,
|
||||
Phone.FEATURE_ENABLE_HIPRI);
|
||||
FEATURE_ENABLE_HIPRI);
|
||||
if (!isWifiConnected) {
|
||||
mWifiManager.setWifiEnabled(false);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user