summaryrefslogtreecommitdiffstats
path: root/core/tests
diff options
context:
space:
mode:
authorXia Wang <xiaw@google.com>2012-03-12 17:55:18 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-03-12 17:55:18 -0700
commit4b87e4a56c520775c69327a36051754faf0ed6c9 (patch)
tree50ee56525485f472f925ba47dd27f7b174a41a75 /core/tests
parentb8c81768d9517bdb36f7ef83e7618fda038c6608 (diff)
parent6d3c2f0cad85b5f618d0bdbf3e9ca659768a47f0 (diff)
downloadframeworks_base-4b87e4a56c520775c69327a36051754faf0ed6c9.zip
frameworks_base-4b87e4a56c520775c69327a36051754faf0ed6c9.tar.gz
frameworks_base-4b87e4a56c520775c69327a36051754faf0ed6c9.tar.bz2
Merge "Fix test flakiness"
Diffstat (limited to 'core/tests')
-rw-r--r--core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/stress/WifiStressTest.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/stress/WifiStressTest.java b/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/stress/WifiStressTest.java
index f46546f..649ec3e 100644
--- a/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/stress/WifiStressTest.java
+++ b/core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/stress/WifiStressTest.java
@@ -97,6 +97,11 @@ public class WifiStressTest
mOutputWriter = new BufferedWriter(new FileWriter(new File(
Environment.getExternalStorageDirectory(), OUTPUT_FILE), true));
mAct.turnScreenOn();
+ if (mAct.mWifiManager.isWifiApEnabled()) {
+ // if soft AP is enabled, disable it
+ assertTrue(mAct.mWifiManager.setWifiApEnabled(null, false));
+ Log.v(TAG, "disable soft ap");
+ }
if (!mAct.mWifiManager.isWifiEnabled()) {
log("Enable wi-fi before stress tests.");
if (!mAct.enableWifi()) {