From 72bf8cd244eaf8d53e5a8075f655260abcadef56 Mon Sep 17 00:00:00 2001 From: steveliu Date: Tue, 31 Mar 2026 15:27:35 +0000 Subject: [PATCH 1/4] Internal Change. PiperOrigin-RevId: 892354630 --- betocq/setup_utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/betocq/setup_utils.py b/betocq/setup_utils.py index 125e67d..e497bbe 100644 --- a/betocq/setup_utils.py +++ b/betocq/setup_utils.py @@ -76,7 +76,7 @@ \s+ (\d+) # Captures Frequency \s+ - [-\d.]+ # Matches RSSI (skipped) + [-\d()./:]+ # Matches RSSI (skipped) \s+ [\d.]+ # Matches Age (skipped) \s* From 62d53332a95cc488e83d42bed7b9d100e6c3b85a Mon Sep 17 00:00:00 2001 From: steveliu Date: Wed, 1 Apr 2026 16:06:14 +0000 Subject: [PATCH 2/4] Internal Change. PiperOrigin-RevId: 892959815 --- betocq/nearby_connection/betocq_aqt_test_suite.py | 7 +------ betocq/nearby_connection/utils.py | 5 ++++- betocq/setup_utils.py | 4 +++- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/betocq/nearby_connection/betocq_aqt_test_suite.py b/betocq/nearby_connection/betocq_aqt_test_suite.py index 046ef90..37bbd00 100644 --- a/betocq/nearby_connection/betocq_aqt_test_suite.py +++ b/betocq/nearby_connection/betocq_aqt_test_suite.py @@ -42,7 +42,7 @@ # increment this version number when adding new tests or changing the config # parameters of existing tests. # LINT.IfChange(suite_version) -_SUITE_VERSION = '5' +_SUITE_VERSION = '6' # LINT.ThenChange() @@ -77,11 +77,6 @@ def _assert_config_parameters(self, config): not test_params.wifi_dfs_5g_ssid, 'wifi_dfs_5g_ssid is not set' ) - asserts.abort_all_if( - not test_params.abort_all_if_any_ap_not_ready, - 'do not change testbed parameters, abort_all_if_any_ap_not_ready is' - ' expected to be True', - ) asserts.abort_all_if( test_params.skip_default_flag_override, 'do not change testbed parameters, skip_default_flag_override is' diff --git a/betocq/nearby_connection/utils.py b/betocq/nearby_connection/utils.py index e7918b7..4cef15a 100644 --- a/betocq/nearby_connection/utils.py +++ b/betocq/nearby_connection/utils.py @@ -115,7 +115,10 @@ def _report_error(error_message: str) -> None: wifi_dfs_5g_ssid, freq_5g_dfs, ) - wifi_scan_results_list = setup_utils.check_wifi_env(advertiser) + wifi_scan_results_list = setup_utils.check_wifi_env( + advertiser, + wifi_scan_wait_time_sec=setup_utils.WIFI_SCAN_WAIT_TIME_SEC * 2 + ) if wifi_scan_results_list: freq_by_ssids = { result['SSID']: result['Frequency'] diff --git a/betocq/setup_utils.py b/betocq/setup_utils.py index e497bbe..841277f 100644 --- a/betocq/setup_utils.py +++ b/betocq/setup_utils.py @@ -738,11 +738,13 @@ def _parse_wifi_scan(scan_results: Iterable[str]) -> Sequence[dict[str, Any]]: def check_wifi_env( ad: android_device.AndroidDevice, + wifi_scan_wait_time_sec: int = WIFI_SCAN_WAIT_TIME_SEC, ) -> Sequence[dict[str, Any]] | None: """Let WI-FI scan and get scan results. Check if the environment is clean. Args: ad: AndroidDevice, Mobly Android Device. + wifi_scan_wait_time_sec: The time to wait for Wi-Fi scan to complete. Returns: Wi-Fi scan results as a list of SSID and Frequency or None if it fails to @@ -754,7 +756,7 @@ def check_wifi_env( # Start wifi scan. try: ad.adb.shell('cmd wifi start-scan') - time.sleep(WIFI_SCAN_WAIT_TIME_SEC) + time.sleep(wifi_scan_wait_time_sec) except adb.AdbError: ad.log.warning('Failed to start wifi scan.', exc_info=True) return None From 9692a72710f8060f54bb33a9f111984c1a9be59c Mon Sep 17 00:00:00 2001 From: Google Date: Wed, 1 Apr 2026 19:10:43 +0000 Subject: [PATCH 3/4] Internal Change. PiperOrigin-RevId: 893050627 --- betocq/app/src/main/AndroidManifestMicroxr.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 betocq/app/src/main/AndroidManifestMicroxr.xml diff --git a/betocq/app/src/main/AndroidManifestMicroxr.xml b/betocq/app/src/main/AndroidManifestMicroxr.xml new file mode 100644 index 0000000..f361d3f --- /dev/null +++ b/betocq/app/src/main/AndroidManifestMicroxr.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + From 377b01adf3fd170f453bc2f65c6cdcec0132cd53 Mon Sep 17 00:00:00 2001 From: steveliu Date: Thu, 2 Apr 2026 20:34:27 +0000 Subject: [PATCH 4/4] Internal Change. PiperOrigin-RevId: 893673111 --- betocq/version.py | 1 + 1 file changed, 1 insertion(+) diff --git a/betocq/version.py b/betocq/version.py index a914d5a..24b0b6a 100644 --- a/betocq/version.py +++ b/betocq/version.py @@ -35,3 +35,4 @@ # '2.6.1': ('Add XCC test cases for AQT.' # 'Update the snippet SDK version to 35 and other bug fixes.') # '2.6.2': ('Optimize tests for AQT and fix some bugs.') +# '2.6.3': ('Fix some bugs.')