Snap for 6398428 from 7db11c5179ae09c250372ad593bf35ff40fa8b26 to rvc-release
Change-Id: I6fec6de60465794b5e24ab748d209702c66d3a4d
diff --git a/acts/framework/acts/test_utils/wifi/aware/AwareBaseTest.py b/acts/framework/acts/test_utils/wifi/aware/AwareBaseTest.py
index df303ce..d7f6ba8 100644
--- a/acts/framework/acts/test_utils/wifi/aware/AwareBaseTest.py
+++ b/acts/framework/acts/test_utils/wifi/aware/AwareBaseTest.py
@@ -40,15 +40,14 @@
not ad.droid.doesDeviceSupportWifiAwareFeature(),
"Device under test does not support Wi-Fi Aware - skipping test"
)
- wutils.wifi_toggle_state(ad, True)
- ad.droid.wifiP2pClose()
- utils.set_location_service(ad, True)
aware_avail = ad.droid.wifiIsAwareAvailable()
+ ad.droid.wifiP2pClose()
+ wutils.wifi_toggle_state(ad, True)
+ utils.set_location_service(ad, True)
if not aware_avail:
self.log.info('Aware not available. Waiting ...')
autils.wait_for_event(ad,
aconsts.BROADCAST_WIFI_AWARE_AVAILABLE)
- ad.ed.clear_all_events()
ad.aware_capabilities = autils.get_aware_capabilities(ad)
self.reset_device_parameters(ad)
self.reset_device_statistics(ad)
@@ -58,6 +57,7 @@
# set randomization interval to 0 (disable) to reduce likelihood of
# interference in tests
autils.configure_mac_random_interval(ad, 0)
+ ad.ed.clear_all_events()
def teardown_test(self):
for ad in self.android_devices:
diff --git a/acts/tests/google/wifi/WifiNetworkSuggestionTest.py b/acts/tests/google/wifi/WifiNetworkSuggestionTest.py
index 06b8b54..2321a71 100644
--- a/acts/tests/google/wifi/WifiNetworkSuggestionTest.py
+++ b/acts/tests/google/wifi/WifiNetworkSuggestionTest.py
@@ -106,6 +106,8 @@
isinstance(self.hidden_networks, list):
self.hidden_network = self.hidden_networks[0]
self.dut.droid.wifiRemoveNetworkSuggestions([])
+ self.dut.adb.shell(
+ "pm disable com.google.android.apps.carrier.carrierwifi")
def setup_test(self):
self.dut.droid.wakeLockAcquireBright()
@@ -130,6 +132,8 @@
self.dut.cat_adb_log(test_name, begin_time)
def teardown_class(self):
+ self.dut.adb.shell(
+ "pm enable com.google.android.apps.carrier.carrierwifi")
if "AccessPoint" in self.user_params:
del self.user_params["reference_networks"]
del self.user_params["open_network"]