Revert "Merge "Migrate test_utils from acts to acts_contrib""
This reverts commit 149b363e5ba3053908b6f0d2331fc14135283f4c.
Reason: updates were not made in acts_power to account for this change.
Will reupload with corresponding changes in acts_power.
Bug: 171076051
Test: local
Change-Id: I464be3f2d9e8c8dadc300283a93e4da93b543178
diff --git a/acts/framework/acts/controllers/fuchsia_lib/bt/gatts_lib.py b/acts/framework/acts/controllers/fuchsia_lib/bt/gatts_lib.py
index 74dc770..5a5a657 100644
--- a/acts/framework/acts/controllers/fuchsia_lib/bt/gatts_lib.py
+++ b/acts/framework/acts/controllers/fuchsia_lib/bt/gatts_lib.py
@@ -28,7 +28,7 @@
Args:
database: A database that follows the conventions of
- acts_contrib.test_utils.bt.gatt_test_database.
+ acts.test_utils.bt.gatt_test_database.
Returns:
Dictionary, None if success, error if error.
diff --git a/acts_tests/acts_contrib/test_utils/OWNERS b/acts/framework/acts/test_utils/OWNERS
similarity index 100%
rename from acts_tests/acts_contrib/test_utils/OWNERS
rename to acts/framework/acts/test_utils/OWNERS
diff --git a/acts_tests/acts_contrib/test_utils/__init__.py b/acts/framework/acts/test_utils/__init__.py
similarity index 100%
rename from acts_tests/acts_contrib/test_utils/__init__.py
rename to acts/framework/acts/test_utils/__init__.py
diff --git a/acts_tests/acts_contrib/test_utils/abstract_devices/__init__.py b/acts/framework/acts/test_utils/abstract_devices/__init__.py
similarity index 100%
rename from acts_tests/acts_contrib/test_utils/abstract_devices/__init__.py
rename to acts/framework/acts/test_utils/abstract_devices/__init__.py
diff --git a/acts_tests/acts_contrib/test_utils/abstract_devices/bluetooth_device.py b/acts/framework/acts/test_utils/abstract_devices/bluetooth_device.py
similarity index 98%
rename from acts_tests/acts_contrib/test_utils/abstract_devices/bluetooth_device.py
rename to acts/framework/acts/test_utils/abstract_devices/bluetooth_device.py
index 1e02d89..633cc4f 100644
--- a/acts_tests/acts_contrib/test_utils/abstract_devices/bluetooth_device.py
+++ b/acts/framework/acts/test_utils/abstract_devices/bluetooth_device.py
@@ -21,16 +21,16 @@
from acts.controllers.android_device import AndroidDevice
from acts.controllers.fuchsia_device import FuchsiaDevice
-from acts_contrib.test_utils.bt.bt_constants import ble_scan_settings_modes
-from acts_contrib.test_utils.bt.bt_constants import gatt_cb_strings
-from acts_contrib.test_utils.bt.bt_constants import gatt_event
-from acts_contrib.test_utils.bt.bt_constants import scan_result
-from acts_contrib.test_utils.bt.bt_gatt_utils import GattTestUtilsError
-from acts_contrib.test_utils.bt.bt_gatt_utils import disconnect_gatt_connection
-from acts_contrib.test_utils.bt.bt_gatt_utils import setup_gatt_connection
-from acts_contrib.test_utils.fuchsia.bt_test_utils import le_scan_for_device_by_name
+from acts.test_utils.bt.bt_constants import ble_scan_settings_modes
+from acts.test_utils.bt.bt_constants import gatt_cb_strings
+from acts.test_utils.bt.bt_constants import gatt_event
+from acts.test_utils.bt.bt_constants import scan_result
+from acts.test_utils.bt.bt_gatt_utils import GattTestUtilsError
+from acts.test_utils.bt.bt_gatt_utils import disconnect_gatt_connection
+from acts.test_utils.bt.bt_gatt_utils import setup_gatt_connection
+from acts.test_utils.fuchsia.bt_test_utils import le_scan_for_device_by_name
-import acts_contrib.test_utils.bt.bt_test_utils as bt_test_utils
+import acts.test_utils.bt.bt_test_utils as bt_test_utils
def create_bluetooth_device(hardware_device):
diff --git a/acts_tests/acts_contrib/test_utils/abstract_devices/bluetooth_handsfree_abstract_device.py b/acts/framework/acts/test_utils/abstract_devices/bluetooth_handsfree_abstract_device.py
similarity index 99%
rename from acts_tests/acts_contrib/test_utils/abstract_devices/bluetooth_handsfree_abstract_device.py
rename to acts/framework/acts/test_utils/abstract_devices/bluetooth_handsfree_abstract_device.py
index 00e0c4a..bb63bd9 100644
--- a/acts_tests/acts_contrib/test_utils/abstract_devices/bluetooth_handsfree_abstract_device.py
+++ b/acts/framework/acts/test_utils/abstract_devices/bluetooth_handsfree_abstract_device.py
@@ -17,7 +17,7 @@
import time
from acts import asserts
from acts.controllers.buds_lib.dev_utils import apollo_sink_events
-from acts_contrib.test_utils.bt.bt_constants import bt_default_timeout
+from acts.test_utils.bt.bt_constants import bt_default_timeout
diff --git a/acts_tests/acts_contrib/test_utils/abstract_devices/utils_lib/wlan_policy_utils.py b/acts/framework/acts/test_utils/abstract_devices/utils_lib/wlan_policy_utils.py
similarity index 100%
rename from acts_tests/acts_contrib/test_utils/abstract_devices/utils_lib/wlan_policy_utils.py
rename to acts/framework/acts/test_utils/abstract_devices/utils_lib/wlan_policy_utils.py
diff --git a/acts_tests/acts_contrib/test_utils/abstract_devices/utils_lib/wlan_utils.py b/acts/framework/acts/test_utils/abstract_devices/utils_lib/wlan_utils.py
similarity index 100%
rename from acts_tests/acts_contrib/test_utils/abstract_devices/utils_lib/wlan_utils.py
rename to acts/framework/acts/test_utils/abstract_devices/utils_lib/wlan_utils.py
diff --git a/acts_tests/acts_contrib/test_utils/abstract_devices/wlan_device.py b/acts/framework/acts/test_utils/abstract_devices/wlan_device.py
similarity index 98%
rename from acts_tests/acts_contrib/test_utils/abstract_devices/wlan_device.py
rename to acts/framework/acts/test_utils/abstract_devices/wlan_device.py
index f1f1b72..a1538bc 100644
--- a/acts_tests/acts_contrib/test_utils/abstract_devices/wlan_device.py
+++ b/acts/framework/acts/test_utils/abstract_devices/wlan_device.py
@@ -17,8 +17,8 @@
import inspect
import logging
-import acts_contrib.test_utils.wifi.wifi_test_utils as awutils
-import acts_contrib.test_utils.abstract_devices.utils_lib.wlan_utils as fwutils
+import acts.test_utils.wifi.wifi_test_utils as awutils
+import acts.test_utils.abstract_devices.utils_lib.wlan_utils as fwutils
from acts.utils import get_interface_ip_addresses
from acts.utils import adb_shell_ping
diff --git a/acts_tests/acts_contrib/test_utils/abstract_devices/wlan_device_lib/AbstractDeviceWlanDeviceBaseTest.py b/acts/framework/acts/test_utils/abstract_devices/wlan_device_lib/AbstractDeviceWlanDeviceBaseTest.py
similarity index 94%
rename from acts_tests/acts_contrib/test_utils/abstract_devices/wlan_device_lib/AbstractDeviceWlanDeviceBaseTest.py
rename to acts/framework/acts/test_utils/abstract_devices/wlan_device_lib/AbstractDeviceWlanDeviceBaseTest.py
index f8b33dc..6dfa376 100644
--- a/acts_tests/acts_contrib/test_utils/abstract_devices/wlan_device_lib/AbstractDeviceWlanDeviceBaseTest.py
+++ b/acts/framework/acts/test_utils/abstract_devices/wlan_device_lib/AbstractDeviceWlanDeviceBaseTest.py
@@ -13,7 +13,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-from acts_contrib.test_utils.wifi.WifiBaseTest import WifiBaseTest
+from acts.test_utils.wifi.WifiBaseTest import WifiBaseTest
class AbstractDeviceWlanDeviceBaseTest(WifiBaseTest):
diff --git a/acts_tests/acts_contrib/test_utils/abstract_devices/wmm_transceiver.py b/acts/framework/acts/test_utils/abstract_devices/wmm_transceiver.py
similarity index 100%
rename from acts_tests/acts_contrib/test_utils/abstract_devices/wmm_transceiver.py
rename to acts/framework/acts/test_utils/abstract_devices/wmm_transceiver.py
diff --git a/acts_tests/acts_contrib/test_utils/audio_analysis_lib/__init__.py b/acts/framework/acts/test_utils/audio_analysis_lib/__init__.py
similarity index 100%
rename from acts_tests/acts_contrib/test_utils/audio_analysis_lib/__init__.py
rename to acts/framework/acts/test_utils/audio_analysis_lib/__init__.py
diff --git a/acts_tests/acts_contrib/test_utils/audio_analysis_lib/audio_analysis.py b/acts/framework/acts/test_utils/audio_analysis_lib/audio_analysis.py
similarity index 100%
rename from acts_tests/acts_contrib/test_utils/audio_analysis_lib/audio_analysis.py
rename to acts/framework/acts/test_utils/audio_analysis_lib/audio_analysis.py
diff --git a/acts_tests/acts_contrib/test_utils/audio_analysis_lib/audio_data.py b/acts/framework/acts/test_utils/audio_analysis_lib/audio_data.py
similarity index 100%
rename from acts_tests/acts_contrib/test_utils/audio_analysis_lib/audio_data.py
rename to acts/framework/acts/test_utils/audio_analysis_lib/audio_data.py
diff --git a/acts_tests/acts_contrib/test_utils/audio_analysis_lib/audio_quality_measurement.py b/acts/framework/acts/test_utils/audio_analysis_lib/audio_quality_measurement.py
similarity index 99%
rename from acts_tests/acts_contrib/test_utils/audio_analysis_lib/audio_quality_measurement.py
rename to acts/framework/acts/test_utils/audio_analysis_lib/audio_quality_measurement.py
index c241fde..e43800f 100644
--- a/acts_tests/acts_contrib/test_utils/audio_analysis_lib/audio_quality_measurement.py
+++ b/acts/framework/acts/test_utils/audio_analysis_lib/audio_quality_measurement.py
@@ -20,7 +20,7 @@
import math
import numpy
-import acts_contrib.test_utils.audio_analysis_lib.audio_analysis as audio_analysis
+import acts.test_utils.audio_analysis_lib.audio_analysis as audio_analysis
# The input signal should be one sine wave with fixed frequency which
# can have silence before and/or after sine wave.
diff --git a/acts_tests/acts_contrib/test_utils/audio_analysis_lib/check_quality.py b/acts/framework/acts/test_utils/audio_analysis_lib/check_quality.py
similarity index 98%
rename from acts_tests/acts_contrib/test_utils/audio_analysis_lib/check_quality.py
rename to acts/framework/acts/test_utils/audio_analysis_lib/check_quality.py
index ad41759..8f29f82 100644
--- a/acts_tests/acts_contrib/test_utils/audio_analysis_lib/check_quality.py
+++ b/acts/framework/acts/test_utils/audio_analysis_lib/check_quality.py
@@ -27,9 +27,9 @@
import tempfile
import wave
-import acts_contrib.test_utils.audio_analysis_lib.audio_analysis as audio_analysis
-import acts_contrib.test_utils.audio_analysis_lib.audio_data as audio_data
-import acts_contrib.test_utils.audio_analysis_lib.audio_quality_measurement as \
+import acts.test_utils.audio_analysis_lib.audio_analysis as audio_analysis
+import acts.test_utils.audio_analysis_lib.audio_data as audio_data
+import acts.test_utils.audio_analysis_lib.audio_quality_measurement as \
audio_quality_measurement
# Holder for quality parameters used in audio_quality_measurement module.
diff --git a/acts_tests/acts_contrib/test_utils/bt/A2dpBaseTest.py b/acts/framework/acts/test_utils/bt/A2dpBaseTest.py
similarity index 95%
rename from acts_tests/acts_contrib/test_utils/bt/A2dpBaseTest.py
rename to acts/framework/acts/test_utils/bt/A2dpBaseTest.py
index ba4cec3..bcc5bdb 100644
--- a/acts_tests/acts_contrib/test_utils/bt/A2dpBaseTest.py
+++ b/acts/framework/acts/test_utils/bt/A2dpBaseTest.py
@@ -19,11 +19,11 @@
import shutil
import time
-import acts_contrib.test_utils.coex.audio_test_utils as atu
-import acts_contrib.test_utils.bt.bt_test_utils as btutils
+import acts.test_utils.coex.audio_test_utils as atu
+import acts.test_utils.bt.bt_test_utils as btutils
from acts import asserts
-from acts_contrib.test_utils.abstract_devices.bluetooth_handsfree_abstract_device import BluetoothHandsfreeAbstractDeviceFactory as bt_factory
-from acts_contrib.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
+from acts.test_utils.abstract_devices.bluetooth_handsfree_abstract_device import BluetoothHandsfreeAbstractDeviceFactory as bt_factory
+from acts.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
PHONE_MUSIC_FILE_DIRECTORY = '/sdcard/Music'
INIT_ATTEN = 0
diff --git a/acts_tests/acts_contrib/test_utils/bt/AvrcpBaseTest.py b/acts/framework/acts/test_utils/bt/AvrcpBaseTest.py
similarity index 85%
rename from acts_tests/acts_contrib/test_utils/bt/AvrcpBaseTest.py
rename to acts/framework/acts/test_utils/bt/AvrcpBaseTest.py
index 9109ae3..475e725 100644
--- a/acts_tests/acts_contrib/test_utils/bt/AvrcpBaseTest.py
+++ b/acts/framework/acts/test_utils/bt/AvrcpBaseTest.py
@@ -19,16 +19,16 @@
import queue
from acts import asserts
-from acts_contrib.test_utils.abstract_devices.bluetooth_handsfree_abstract_device import BluetoothHandsfreeAbstractDeviceFactory as Factory
-from acts_contrib.test_utils.bt.simulated_carkit_device import SimulatedCarkitDevice
-from acts_contrib.test_utils.bt.bt_test_utils import connect_phone_to_headset
-from acts_contrib.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
-from acts_contrib.test_utils.car.car_media_utils import EVENT_PLAY_RECEIVED
-from acts_contrib.test_utils.car.car_media_utils import EVENT_PAUSE_RECEIVED
-from acts_contrib.test_utils.car.car_media_utils import EVENT_SKIP_NEXT_RECEIVED
-from acts_contrib.test_utils.car.car_media_utils import EVENT_SKIP_PREV_RECEIVED
-from acts_contrib.test_utils.car.car_media_utils import CMD_MEDIA_PLAY
-from acts_contrib.test_utils.car.car_media_utils import CMD_MEDIA_PAUSE
+from acts.test_utils.abstract_devices.bluetooth_handsfree_abstract_device import BluetoothHandsfreeAbstractDeviceFactory as Factory
+from acts.test_utils.bt.simulated_carkit_device import SimulatedCarkitDevice
+from acts.test_utils.bt.bt_test_utils import connect_phone_to_headset
+from acts.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
+from acts.test_utils.car.car_media_utils import EVENT_PLAY_RECEIVED
+from acts.test_utils.car.car_media_utils import EVENT_PAUSE_RECEIVED
+from acts.test_utils.car.car_media_utils import EVENT_SKIP_NEXT_RECEIVED
+from acts.test_utils.car.car_media_utils import EVENT_SKIP_PREV_RECEIVED
+from acts.test_utils.car.car_media_utils import CMD_MEDIA_PLAY
+from acts.test_utils.car.car_media_utils import CMD_MEDIA_PAUSE
ADB_FILE_EXISTS = 'test -e %s && echo True'
DEFAULT_TIMEOUT = 5
diff --git a/acts_tests/acts_contrib/test_utils/bt/BleEnum.py b/acts/framework/acts/test_utils/bt/BleEnum.py
similarity index 100%
rename from acts_tests/acts_contrib/test_utils/bt/BleEnum.py
rename to acts/framework/acts/test_utils/bt/BleEnum.py
diff --git a/acts_tests/acts_contrib/test_utils/bt/BluetoothBaseTest.py b/acts/framework/acts/test_utils/bt/BluetoothBaseTest.py
similarity index 91%
rename from acts_tests/acts_contrib/test_utils/bt/BluetoothBaseTest.py
rename to acts/framework/acts/test_utils/bt/BluetoothBaseTest.py
index a531bea..8b24558 100644
--- a/acts_tests/acts_contrib/test_utils/bt/BluetoothBaseTest.py
+++ b/acts/framework/acts/test_utils/bt/BluetoothBaseTest.py
@@ -26,18 +26,18 @@
from acts.utils import dump_string_to_file
from acts.libs.proto.proto_utils import parse_proto_to_ascii
-from acts_contrib.test_utils.bt.bt_metrics_utils import get_bluetooth_metrics
-from acts_contrib.test_utils.bt.bt_test_utils import get_device_selector_dictionary
-from acts_contrib.test_utils.bt.bt_test_utils import reset_bluetooth
-from acts_contrib.test_utils.bt.bt_test_utils import setup_multiple_devices_for_bt_test
-from acts_contrib.test_utils.bt.bt_test_utils import take_btsnoop_logs
-from acts_contrib.test_utils.bt.ble_lib import BleLib
-from acts_contrib.test_utils.bt.bta_lib import BtaLib
-from acts_contrib.test_utils.bt.config_lib import ConfigLib
-from acts_contrib.test_utils.bt.gattc_lib import GattClientLib
-from acts_contrib.test_utils.bt.gatts_lib import GattServerLib
-from acts_contrib.test_utils.bt.rfcomm_lib import RfcommLib
-from acts_contrib.test_utils.bt.shell_commands_lib import ShellCommands
+from acts.test_utils.bt.bt_metrics_utils import get_bluetooth_metrics
+from acts.test_utils.bt.bt_test_utils import get_device_selector_dictionary
+from acts.test_utils.bt.bt_test_utils import reset_bluetooth
+from acts.test_utils.bt.bt_test_utils import setup_multiple_devices_for_bt_test
+from acts.test_utils.bt.bt_test_utils import take_btsnoop_logs
+from acts.test_utils.bt.ble_lib import BleLib
+from acts.test_utils.bt.bta_lib import BtaLib
+from acts.test_utils.bt.config_lib import ConfigLib
+from acts.test_utils.bt.gattc_lib import GattClientLib
+from acts.test_utils.bt.gatts_lib import GattServerLib
+from acts.test_utils.bt.rfcomm_lib import RfcommLib
+from acts.test_utils.bt.shell_commands_lib import ShellCommands
class BluetoothBaseTest(BaseTestClass):
diff --git a/acts_tests/acts_contrib/test_utils/bt/BluetoothCarHfpBaseTest.py b/acts/framework/acts/test_utils/bt/BluetoothCarHfpBaseTest.py
similarity index 91%
rename from acts_tests/acts_contrib/test_utils/bt/BluetoothCarHfpBaseTest.py
rename to acts/framework/acts/test_utils/bt/BluetoothCarHfpBaseTest.py
index 303b961..ece7ed5 100644
--- a/acts_tests/acts_contrib/test_utils/bt/BluetoothCarHfpBaseTest.py
+++ b/acts/framework/acts/test_utils/bt/BluetoothCarHfpBaseTest.py
@@ -23,11 +23,11 @@
from queue import Empty
from acts.keys import Config
-from acts_contrib.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
-from acts_contrib.test_utils.bt.bt_test_utils import pair_pri_to_sec
-from acts_contrib.test_utils.tel.tel_test_utils import ensure_phones_default_state
-from acts_contrib.test_utils.tel.tel_test_utils import get_phone_number
-from acts_contrib.test_utils.tel.tel_test_utils import setup_droid_properties
+from acts.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
+from acts.test_utils.bt.bt_test_utils import pair_pri_to_sec
+from acts.test_utils.tel.tel_test_utils import ensure_phones_default_state
+from acts.test_utils.tel.tel_test_utils import get_phone_number
+from acts.test_utils.tel.tel_test_utils import setup_droid_properties
class BluetoothCarHfpBaseTest(BluetoothBaseTest):
diff --git a/acts_tests/acts_contrib/test_utils/bt/BtEnum.py b/acts/framework/acts/test_utils/bt/BtEnum.py
similarity index 100%
rename from acts_tests/acts_contrib/test_utils/bt/BtEnum.py
rename to acts/framework/acts/test_utils/bt/BtEnum.py
diff --git a/acts_tests/acts_contrib/test_utils/bt/BtFunhausBaseTest.py b/acts/framework/acts/test_utils/bt/BtFunhausBaseTest.py
similarity index 97%
rename from acts_tests/acts_contrib/test_utils/bt/BtFunhausBaseTest.py
rename to acts/framework/acts/test_utils/bt/BtFunhausBaseTest.py
index 127289e..0678345 100644
--- a/acts_tests/acts_contrib/test_utils/bt/BtFunhausBaseTest.py
+++ b/acts/framework/acts/test_utils/bt/BtFunhausBaseTest.py
@@ -17,8 +17,8 @@
Test script to automate the Bluetooth Audio Funhaus.
"""
from acts.keys import Config
-from acts_contrib.test_utils.bt.BtMetricsBaseTest import BtMetricsBaseTest
-from acts_contrib.test_utils.bt.bt_test_utils import bluetooth_enabled_check
+from acts.test_utils.bt.BtMetricsBaseTest import BtMetricsBaseTest
+from acts.test_utils.bt.bt_test_utils import bluetooth_enabled_check
from acts.utils import bypass_setup_wizard
from acts.utils import exe_cmd
from acts.utils import sync_device_time
diff --git a/acts_tests/acts_contrib/test_utils/bt/BtInterferenceBaseTest.py b/acts/framework/acts/test_utils/bt/BtInterferenceBaseTest.py
similarity index 94%
rename from acts_tests/acts_contrib/test_utils/bt/BtInterferenceBaseTest.py
rename to acts/framework/acts/test_utils/bt/BtInterferenceBaseTest.py
index 3c49bee..5882bc6 100644
--- a/acts_tests/acts_contrib/test_utils/bt/BtInterferenceBaseTest.py
+++ b/acts/framework/acts/test_utils/bt/BtInterferenceBaseTest.py
@@ -21,14 +21,14 @@
import time
import acts.controllers.iperf_client as ipc
import acts.controllers.iperf_server as ipf
-import acts_contrib.test_utils.bt.bt_test_utils as btutils
+import acts.test_utils.bt.bt_test_utils as btutils
from acts import asserts
-from acts_contrib.test_utils.bt.A2dpBaseTest import A2dpBaseTest
-from acts_contrib.test_utils.bt.loggers import bluetooth_metric_logger as log
-from acts_contrib.test_utils.wifi import wifi_performance_test_utils as wpeutils
-from acts_contrib.test_utils.wifi import wifi_power_test_utils as wputils
-from acts_contrib.test_utils.wifi import wifi_test_utils as wutils
-from acts_contrib.test_utils.power.PowerBaseTest import ObjNew
+from acts.test_utils.bt.A2dpBaseTest import A2dpBaseTest
+from acts.test_utils.bt.loggers import bluetooth_metric_logger as log
+from acts.test_utils.wifi import wifi_performance_test_utils as wpeutils
+from acts.test_utils.wifi import wifi_power_test_utils as wputils
+from acts.test_utils.wifi import wifi_test_utils as wutils
+from acts.test_utils.power.PowerBaseTest import ObjNew
MAX_ATTENUATION = 95
TEMP_FILE = '/sdcard/Download/tmp.log'
diff --git a/acts_tests/acts_contrib/test_utils/bt/BtMetricsBaseTest.py b/acts/framework/acts/test_utils/bt/BtMetricsBaseTest.py
similarity index 94%
rename from acts_tests/acts_contrib/test_utils/bt/BtMetricsBaseTest.py
rename to acts/framework/acts/test_utils/bt/BtMetricsBaseTest.py
index 02ed03a..b56b56c 100644
--- a/acts_tests/acts_contrib/test_utils/bt/BtMetricsBaseTest.py
+++ b/acts/framework/acts/test_utils/bt/BtMetricsBaseTest.py
@@ -14,8 +14,8 @@
import os
from acts.libs.proto.proto_utils import parse_proto_to_ascii
-from acts_contrib.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
-from acts_contrib.test_utils.bt.bt_metrics_utils import get_bluetooth_metrics
+from acts.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
+from acts.test_utils.bt.bt_metrics_utils import get_bluetooth_metrics
from acts.utils import dump_string_to_file
diff --git a/acts_tests/acts_contrib/test_utils/bt/BtSarBaseTest.py b/acts/framework/acts/test_utils/bt/BtSarBaseTest.py
similarity index 97%
rename from acts_tests/acts_contrib/test_utils/bt/BtSarBaseTest.py
rename to acts/framework/acts/test_utils/bt/BtSarBaseTest.py
index 6b6e548..5091407 100644
--- a/acts_tests/acts_contrib/test_utils/bt/BtSarBaseTest.py
+++ b/acts/framework/acts/test_utils/bt/BtSarBaseTest.py
@@ -25,12 +25,12 @@
from acts.base_test import BaseTestClass
from acts.metrics.loggers.blackbox import BlackboxMetricLogger
-from acts_contrib.test_utils.bt.bt_power_test_utils import MediaControl
-from acts_contrib.test_utils.bt.ble_performance_test_utils import run_ble_throughput_and_read_rssi
-from acts_contrib.test_utils.abstract_devices.bluetooth_handsfree_abstract_device import BluetoothHandsfreeAbstractDeviceFactory as bt_factory
+from acts.test_utils.bt.bt_power_test_utils import MediaControl
+from acts.test_utils.bt.ble_performance_test_utils import run_ble_throughput_and_read_rssi
+from acts.test_utils.abstract_devices.bluetooth_handsfree_abstract_device import BluetoothHandsfreeAbstractDeviceFactory as bt_factory
-import acts_contrib.test_utils.bt.bt_test_utils as bt_utils
-import acts_contrib.test_utils.wifi.wifi_performance_test_utils as wifi_utils
+import acts.test_utils.bt.bt_test_utils as bt_utils
+import acts.test_utils.wifi.wifi_performance_test_utils as wifi_utils
PHONE_MUSIC_FILE_DIRECTORY = '/sdcard/Music'
diff --git a/acts_tests/acts_contrib/test_utils/bt/GattConnectedBaseTest.py b/acts/framework/acts/test_utils/bt/GattConnectedBaseTest.py
similarity index 89%
rename from acts_tests/acts_contrib/test_utils/bt/GattConnectedBaseTest.py
rename to acts/framework/acts/test_utils/bt/GattConnectedBaseTest.py
index d6fc433..6cf4c28 100644
--- a/acts_tests/acts_contrib/test_utils/bt/GattConnectedBaseTest.py
+++ b/acts/framework/acts/test_utils/bt/GattConnectedBaseTest.py
@@ -20,20 +20,20 @@
from queue import Empty
-from acts_contrib.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
-from acts_contrib.test_utils.bt.bt_constants import gatt_characteristic
-from acts_contrib.test_utils.bt.bt_constants import gatt_descriptor
-from acts_contrib.test_utils.bt.bt_constants import gatt_service_types
-from acts_contrib.test_utils.bt.bt_constants import gatt_event
-from acts_contrib.test_utils.bt.bt_constants import gatt_cb_err
-from acts_contrib.test_utils.bt.bt_constants import gatt_cb_strings
-from acts_contrib.test_utils.bt.bt_constants import gatt_mtu_size
-from acts_contrib.test_utils.bt.bt_gatt_utils import disconnect_gatt_connection
-from acts_contrib.test_utils.bt.bt_gatt_utils import orchestrate_gatt_connection
-from acts_contrib.test_utils.bt.bt_gatt_utils import setup_gatt_characteristics
-from acts_contrib.test_utils.bt.bt_gatt_utils import setup_gatt_descriptors
-from acts_contrib.test_utils.bt.bt_constants import gatt_char_desc_uuids
-from acts_contrib.test_utils.bt.bt_constants import bt_default_timeout
+from acts.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
+from acts.test_utils.bt.bt_constants import gatt_characteristic
+from acts.test_utils.bt.bt_constants import gatt_descriptor
+from acts.test_utils.bt.bt_constants import gatt_service_types
+from acts.test_utils.bt.bt_constants import gatt_event
+from acts.test_utils.bt.bt_constants import gatt_cb_err
+from acts.test_utils.bt.bt_constants import gatt_cb_strings
+from acts.test_utils.bt.bt_constants import gatt_mtu_size
+from acts.test_utils.bt.bt_gatt_utils import disconnect_gatt_connection
+from acts.test_utils.bt.bt_gatt_utils import orchestrate_gatt_connection
+from acts.test_utils.bt.bt_gatt_utils import setup_gatt_characteristics
+from acts.test_utils.bt.bt_gatt_utils import setup_gatt_descriptors
+from acts.test_utils.bt.bt_constants import gatt_char_desc_uuids
+from acts.test_utils.bt.bt_constants import bt_default_timeout
class GattConnectedBaseTest(BluetoothBaseTest):
diff --git a/acts_tests/acts_contrib/test_utils/bt/GattEnum.py b/acts/framework/acts/test_utils/bt/GattEnum.py
similarity index 100%
rename from acts_tests/acts_contrib/test_utils/bt/GattEnum.py
rename to acts/framework/acts/test_utils/bt/GattEnum.py
diff --git a/acts_tests/acts_contrib/test_utils/bt/__init__.py b/acts/framework/acts/test_utils/bt/__init__.py
similarity index 100%
rename from acts_tests/acts_contrib/test_utils/bt/__init__.py
rename to acts/framework/acts/test_utils/bt/__init__.py
diff --git a/acts_tests/acts_contrib/test_utils/bt/ble_lib.py b/acts/framework/acts/test_utils/bt/ble_lib.py
similarity index 92%
rename from acts_tests/acts_contrib/test_utils/bt/ble_lib.py
rename to acts/framework/acts/test_utils/bt/ble_lib.py
index 4fac563..c9e478d 100644
--- a/acts_tests/acts_contrib/test_utils/bt/ble_lib.py
+++ b/acts/framework/acts/test_utils/bt/ble_lib.py
@@ -17,15 +17,15 @@
Ble libraries
"""
-from acts_contrib.test_utils.bt.bt_constants import ble_advertise_settings_modes
-from acts_contrib.test_utils.bt.bt_constants import ble_advertise_settings_tx_powers
-from acts_contrib.test_utils.bt.bt_constants import ble_scan_settings_modes
-from acts_contrib.test_utils.bt.bt_constants import small_timeout
-from acts_contrib.test_utils.bt.bt_constants import adv_fail
-from acts_contrib.test_utils.bt.bt_constants import adv_succ
-from acts_contrib.test_utils.bt.bt_constants import advertising_set_on_own_address_read
-from acts_contrib.test_utils.bt.bt_constants import advertising_set_started
-from acts_contrib.test_utils.bt.bt_test_utils import generate_ble_advertise_objects
+from acts.test_utils.bt.bt_constants import ble_advertise_settings_modes
+from acts.test_utils.bt.bt_constants import ble_advertise_settings_tx_powers
+from acts.test_utils.bt.bt_constants import ble_scan_settings_modes
+from acts.test_utils.bt.bt_constants import small_timeout
+from acts.test_utils.bt.bt_constants import adv_fail
+from acts.test_utils.bt.bt_constants import adv_succ
+from acts.test_utils.bt.bt_constants import advertising_set_on_own_address_read
+from acts.test_utils.bt.bt_constants import advertising_set_started
+from acts.test_utils.bt.bt_test_utils import generate_ble_advertise_objects
import time
import os
diff --git a/acts_tests/acts_contrib/test_utils/bt/ble_performance_test_utils.py b/acts/framework/acts/test_utils/bt/ble_performance_test_utils.py
similarity index 91%
rename from acts_tests/acts_contrib/test_utils/bt/ble_performance_test_utils.py
rename to acts/framework/acts/test_utils/bt/ble_performance_test_utils.py
index 394e962..44d5610 100644
--- a/acts_tests/acts_contrib/test_utils/bt/ble_performance_test_utils.py
+++ b/acts/framework/acts/test_utils/bt/ble_performance_test_utils.py
@@ -20,15 +20,15 @@
from queue import Empty
from concurrent.futures import ThreadPoolExecutor
-from acts_contrib.test_utils.bt.bt_gatt_utils import close_gatt_client
-from acts_contrib.test_utils.bt.bt_coc_test_utils import do_multi_connection_throughput
-from acts_contrib.test_utils.bt.bt_gatt_utils import disconnect_gatt_connection
-from acts_contrib.test_utils.bt.bt_constants import gatt_cb_err
-from acts_contrib.test_utils.bt.bt_constants import gatt_cb_strings
-from acts_contrib.test_utils.bt.bt_constants import l2cap_coc_header_size
-from acts_contrib.test_utils.bt.bt_gatt_utils import GattTestUtilsError
-from acts_contrib.test_utils.bt.bt_coc_test_utils import orchestrate_coc_connection
-from acts_contrib.test_utils.bt.bt_gatt_utils import orchestrate_gatt_connection
+from acts.test_utils.bt.bt_gatt_utils import close_gatt_client
+from acts.test_utils.bt.bt_coc_test_utils import do_multi_connection_throughput
+from acts.test_utils.bt.bt_gatt_utils import disconnect_gatt_connection
+from acts.test_utils.bt.bt_constants import gatt_cb_err
+from acts.test_utils.bt.bt_constants import gatt_cb_strings
+from acts.test_utils.bt.bt_constants import l2cap_coc_header_size
+from acts.test_utils.bt.bt_gatt_utils import GattTestUtilsError
+from acts.test_utils.bt.bt_coc_test_utils import orchestrate_coc_connection
+from acts.test_utils.bt.bt_gatt_utils import orchestrate_gatt_connection
default_event_timeout = 10
rssi_read_duration = 25
diff --git a/acts_tests/acts_contrib/test_utils/bt/bt_carkit_lib.py b/acts/framework/acts/test_utils/bt/bt_carkit_lib.py
similarity index 96%
rename from acts_tests/acts_contrib/test_utils/bt/bt_carkit_lib.py
rename to acts/framework/acts/test_utils/bt/bt_carkit_lib.py
index 14a42b0..ce7e8fe 100644
--- a/acts_tests/acts_contrib/test_utils/bt/bt_carkit_lib.py
+++ b/acts/framework/acts/test_utils/bt/bt_carkit_lib.py
@@ -19,24 +19,24 @@
from acts.keys import Config
from acts.utils import rand_ascii_str
-from acts_contrib.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
-from acts_contrib.test_utils.bt.bt_constants import logcat_strings
-from acts_contrib.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
-from acts_contrib.test_utils.tel.tel_defines import AUDIO_ROUTE_BLUETOOTH
-from acts_contrib.test_utils.tel.tel_defines import AUDIO_ROUTE_EARPIECE
-from acts_contrib.test_utils.tel.tel_defines import AUDIO_ROUTE_SPEAKER
-from acts_contrib.test_utils.tel.tel_defines import WAIT_TIME_IN_CALL
-from acts_contrib.test_utils.tel.tel_test_utils import get_phone_number
-from acts_contrib.test_utils.tel.tel_test_utils import hangup_call
-from acts_contrib.test_utils.tel.tel_test_utils import initiate_call
-from acts_contrib.test_utils.tel.tel_test_utils import num_active_calls
-from acts_contrib.test_utils.tel.tel_test_utils import sms_send_receive_verify
-from acts_contrib.test_utils.tel.tel_test_utils import wait_and_answer_call
-from acts_contrib.test_utils.tel.tel_voice_utils import get_audio_route
-from acts_contrib.test_utils.tel.tel_voice_utils import set_audio_route
-from acts_contrib.test_utils.tel.tel_voice_utils import swap_calls
-from acts_contrib.test_utils.tel.tel_test_utils import toggle_airplane_mode
-from acts_contrib.test_utils.tel.tel_test_utils import call_setup_teardown
+from acts.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
+from acts.test_utils.bt.bt_constants import logcat_strings
+from acts.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
+from acts.test_utils.tel.tel_defines import AUDIO_ROUTE_BLUETOOTH
+from acts.test_utils.tel.tel_defines import AUDIO_ROUTE_EARPIECE
+from acts.test_utils.tel.tel_defines import AUDIO_ROUTE_SPEAKER
+from acts.test_utils.tel.tel_defines import WAIT_TIME_IN_CALL
+from acts.test_utils.tel.tel_test_utils import get_phone_number
+from acts.test_utils.tel.tel_test_utils import hangup_call
+from acts.test_utils.tel.tel_test_utils import initiate_call
+from acts.test_utils.tel.tel_test_utils import num_active_calls
+from acts.test_utils.tel.tel_test_utils import sms_send_receive_verify
+from acts.test_utils.tel.tel_test_utils import wait_and_answer_call
+from acts.test_utils.tel.tel_voice_utils import get_audio_route
+from acts.test_utils.tel.tel_voice_utils import set_audio_route
+from acts.test_utils.tel.tel_voice_utils import swap_calls
+from acts.test_utils.tel.tel_test_utils import toggle_airplane_mode
+from acts.test_utils.tel.tel_test_utils import call_setup_teardown
from acts.utils import exe_cmd
from acts.utils import get_current_epoch_time
diff --git a/acts_tests/acts_contrib/test_utils/bt/bt_coc_test_utils.py b/acts/framework/acts/test_utils/bt/bt_coc_test_utils.py
similarity index 91%
rename from acts_tests/acts_contrib/test_utils/bt/bt_coc_test_utils.py
rename to acts/framework/acts/test_utils/bt/bt_coc_test_utils.py
index 14d3e2c..99de4d9 100644
--- a/acts_tests/acts_contrib/test_utils/bt/bt_coc_test_utils.py
+++ b/acts/framework/acts/test_utils/bt/bt_coc_test_utils.py
@@ -18,19 +18,19 @@
import time
from acts import utils
-from acts_contrib.test_utils.bt.bt_constants import bt_default_timeout
-from acts_contrib.test_utils.bt.bt_constants import default_bluetooth_socket_timeout_ms
-from acts_contrib.test_utils.bt.bt_constants import default_le_connection_interval_ms
-from acts_contrib.test_utils.bt.bt_constants import default_le_data_length
-from acts_contrib.test_utils.bt.bt_constants import gatt_phy
-from acts_contrib.test_utils.bt.bt_constants import gatt_transport
-from acts_contrib.test_utils.bt.bt_constants import l2cap_coc_header_size
-from acts_contrib.test_utils.bt.bt_constants import le_connection_event_time_step_ms
-from acts_contrib.test_utils.bt.bt_constants import le_connection_interval_time_step_ms
-from acts_contrib.test_utils.bt.bt_constants import le_default_supervision_timeout
-from acts_contrib.test_utils.bt.bt_test_utils import get_mac_address_of_generic_advertisement
-from acts_contrib.test_utils.bt.bt_gatt_utils import setup_gatt_connection
-from acts_contrib.test_utils.bt.bt_gatt_utils import disconnect_gatt_connection
+from acts.test_utils.bt.bt_constants import bt_default_timeout
+from acts.test_utils.bt.bt_constants import default_bluetooth_socket_timeout_ms
+from acts.test_utils.bt.bt_constants import default_le_connection_interval_ms
+from acts.test_utils.bt.bt_constants import default_le_data_length
+from acts.test_utils.bt.bt_constants import gatt_phy
+from acts.test_utils.bt.bt_constants import gatt_transport
+from acts.test_utils.bt.bt_constants import l2cap_coc_header_size
+from acts.test_utils.bt.bt_constants import le_connection_event_time_step_ms
+from acts.test_utils.bt.bt_constants import le_connection_interval_time_step_ms
+from acts.test_utils.bt.bt_constants import le_default_supervision_timeout
+from acts.test_utils.bt.bt_test_utils import get_mac_address_of_generic_advertisement
+from acts.test_utils.bt.bt_gatt_utils import setup_gatt_connection
+from acts.test_utils.bt.bt_gatt_utils import disconnect_gatt_connection
log = logging
diff --git a/acts_tests/acts_contrib/test_utils/bt/bt_constants.py b/acts/framework/acts/test_utils/bt/bt_constants.py
similarity index 100%
rename from acts_tests/acts_contrib/test_utils/bt/bt_constants.py
rename to acts/framework/acts/test_utils/bt/bt_constants.py
diff --git a/acts_tests/acts_contrib/test_utils/bt/bt_contacts_utils.py b/acts/framework/acts/test_utils/bt/bt_contacts_utils.py
similarity index 100%
rename from acts_tests/acts_contrib/test_utils/bt/bt_contacts_utils.py
rename to acts/framework/acts/test_utils/bt/bt_contacts_utils.py
diff --git a/acts_tests/acts_contrib/test_utils/bt/bt_factory.py b/acts/framework/acts/test_utils/bt/bt_factory.py
similarity index 93%
rename from acts_tests/acts_contrib/test_utils/bt/bt_factory.py
rename to acts/framework/acts/test_utils/bt/bt_factory.py
index cbc4f09..7937790 100644
--- a/acts_tests/acts_contrib/test_utils/bt/bt_factory.py
+++ b/acts/framework/acts/test_utils/bt/bt_factory.py
@@ -33,7 +33,7 @@
bt_devices = []
for config in configs:
bt_name = config['bt_module']
- bt = importlib.import_module('acts_contrib.test_utils.bt.bt_implementations.%s'
+ bt = importlib.import_module('acts.test_utils.bt.bt_implementations.%s'
% bt_name)
bt_devices.append(bt.BluethoothDevice(config))
return bt_devices
diff --git a/acts_tests/acts_contrib/test_utils/bt/bt_gatt_utils.py b/acts/framework/acts/test_utils/bt/bt_gatt_utils.py
similarity index 95%
rename from acts_tests/acts_contrib/test_utils/bt/bt_gatt_utils.py
rename to acts/framework/acts/test_utils/bt/bt_gatt_utils.py
index e902ec2..28aa65a 100644
--- a/acts_tests/acts_contrib/test_utils/bt/bt_gatt_utils.py
+++ b/acts/framework/acts/test_utils/bt/bt_gatt_utils.py
@@ -16,16 +16,16 @@
import logging
-from acts_contrib.test_utils.bt.bt_test_utils import BtTestUtilsError
-from acts_contrib.test_utils.bt.bt_test_utils import get_mac_address_of_generic_advertisement
-from acts_contrib.test_utils.bt.bt_constants import gatt_cb_err
-from acts_contrib.test_utils.bt.bt_constants import gatt_cb_strings
-from acts_contrib.test_utils.bt.bt_constants import gatt_connection_state
-from acts_contrib.test_utils.bt.bt_constants import gatt_characteristic
-from acts_contrib.test_utils.bt.bt_constants import gatt_descriptor
-from acts_contrib.test_utils.bt.bt_constants import gatt_phy_mask
-from acts_contrib.test_utils.bt.bt_constants import gatt_service_types
-from acts_contrib.test_utils.bt.bt_constants import gatt_transport
+from acts.test_utils.bt.bt_test_utils import BtTestUtilsError
+from acts.test_utils.bt.bt_test_utils import get_mac_address_of_generic_advertisement
+from acts.test_utils.bt.bt_constants import gatt_cb_err
+from acts.test_utils.bt.bt_constants import gatt_cb_strings
+from acts.test_utils.bt.bt_constants import gatt_connection_state
+from acts.test_utils.bt.bt_constants import gatt_characteristic
+from acts.test_utils.bt.bt_constants import gatt_descriptor
+from acts.test_utils.bt.bt_constants import gatt_phy_mask
+from acts.test_utils.bt.bt_constants import gatt_service_types
+from acts.test_utils.bt.bt_constants import gatt_transport
import pprint
from queue import Empty
diff --git a/acts_tests/acts_contrib/test_utils/bt/bt_implementations/bt_stub.py b/acts/framework/acts/test_utils/bt/bt_implementations/bt_stub.py
similarity index 100%
rename from acts_tests/acts_contrib/test_utils/bt/bt_implementations/bt_stub.py
rename to acts/framework/acts/test_utils/bt/bt_implementations/bt_stub.py
diff --git a/acts_tests/acts_contrib/test_utils/bt/bt_metrics_utils.py b/acts/framework/acts/test_utils/bt/bt_metrics_utils.py
similarity index 97%
rename from acts_tests/acts_contrib/test_utils/bt/bt_metrics_utils.py
rename to acts/framework/acts/test_utils/bt/bt_metrics_utils.py
index f30fe84..afdfbdd 100644
--- a/acts_tests/acts_contrib/test_utils/bt/bt_metrics_utils.py
+++ b/acts/framework/acts/test_utils/bt/bt_metrics_utils.py
@@ -12,7 +12,7 @@
# License for the specific language governing permissions and limitations under
# the License.
import base64
-from acts_contrib.test_utils.bt.protos import bluetooth_pb2
+from acts.test_utils.bt.protos import bluetooth_pb2
def get_bluetooth_metrics(ad):
diff --git a/acts_tests/acts_contrib/test_utils/bt/bt_power_test_utils.py b/acts/framework/acts/test_utils/bt/bt_power_test_utils.py
similarity index 97%
rename from acts_tests/acts_contrib/test_utils/bt/bt_power_test_utils.py
rename to acts/framework/acts/test_utils/bt/bt_power_test_utils.py
index 899621f..14f3e56 100644
--- a/acts_tests/acts_contrib/test_utils/bt/bt_power_test_utils.py
+++ b/acts/framework/acts/test_utils/bt/bt_power_test_utils.py
@@ -16,8 +16,8 @@
import logging
import time
-import acts_contrib.test_utils.bt.BleEnum as bleenum
-import acts_contrib.test_utils.instrumentation.device.command.instrumentation_command_builder as icb
+import acts.test_utils.bt.BleEnum as bleenum
+import acts.test_utils.instrumentation.device.command.instrumentation_command_builder as icb
BLE_LOCATION_SCAN_ENABLE = 'settings put global ble_scan_always_enabled 1'
BLE_LOCATION_SCAN_DISABLE = 'settings put global ble_scan_always_enabled 0'
diff --git a/acts_tests/acts_contrib/test_utils/bt/bt_test_utils.py b/acts/framework/acts/test_utils/bt/bt_test_utils.py
similarity index 96%
rename from acts_tests/acts_contrib/test_utils/bt/bt_test_utils.py
rename to acts/framework/acts/test_utils/bt/bt_test_utils.py
index 653e4df..a7e51bd 100644
--- a/acts_tests/acts_contrib/test_utils/bt/bt_test_utils.py
+++ b/acts/framework/acts/test_utils/bt/bt_test_utils.py
@@ -25,39 +25,39 @@
from subprocess import call
from acts import asserts
-from acts_contrib.test_utils.bt.bt_constants import adv_fail
-from acts_contrib.test_utils.bt.bt_constants import adv_succ
-from acts_contrib.test_utils.bt.bt_constants import batch_scan_not_supported_list
-from acts_contrib.test_utils.bt.bt_constants import batch_scan_result
-from acts_contrib.test_utils.bt.bt_constants import bits_per_samples
-from acts_contrib.test_utils.bt.bt_constants import ble_advertise_settings_modes
-from acts_contrib.test_utils.bt.bt_constants import ble_advertise_settings_tx_powers
-from acts_contrib.test_utils.bt.bt_constants import bluetooth_a2dp_codec_config_changed
-from acts_contrib.test_utils.bt.bt_constants import bluetooth_off
-from acts_contrib.test_utils.bt.bt_constants import bluetooth_on
-from acts_contrib.test_utils.bt.bt_constants import \
+from acts.test_utils.bt.bt_constants import adv_fail
+from acts.test_utils.bt.bt_constants import adv_succ
+from acts.test_utils.bt.bt_constants import batch_scan_not_supported_list
+from acts.test_utils.bt.bt_constants import batch_scan_result
+from acts.test_utils.bt.bt_constants import bits_per_samples
+from acts.test_utils.bt.bt_constants import ble_advertise_settings_modes
+from acts.test_utils.bt.bt_constants import ble_advertise_settings_tx_powers
+from acts.test_utils.bt.bt_constants import bluetooth_a2dp_codec_config_changed
+from acts.test_utils.bt.bt_constants import bluetooth_off
+from acts.test_utils.bt.bt_constants import bluetooth_on
+from acts.test_utils.bt.bt_constants import \
bluetooth_profile_connection_state_changed
-from acts_contrib.test_utils.bt.bt_constants import bluetooth_socket_conn_test_uuid
-from acts_contrib.test_utils.bt.bt_constants import bt_default_timeout
-from acts_contrib.test_utils.bt.bt_constants import bt_profile_constants
-from acts_contrib.test_utils.bt.bt_constants import bt_profile_states
-from acts_contrib.test_utils.bt.bt_constants import bt_rfcomm_uuids
-from acts_contrib.test_utils.bt.bt_constants import bt_scan_mode_types
-from acts_contrib.test_utils.bt.bt_constants import btsnoop_last_log_path_on_device
-from acts_contrib.test_utils.bt.bt_constants import btsnoop_log_path_on_device
-from acts_contrib.test_utils.bt.bt_constants import channel_modes
-from acts_contrib.test_utils.bt.bt_constants import codec_types
-from acts_contrib.test_utils.bt.bt_constants import default_bluetooth_socket_timeout_ms
-from acts_contrib.test_utils.bt.bt_constants import default_rfcomm_timeout_ms
-from acts_contrib.test_utils.bt.bt_constants import hid_id_keyboard
-from acts_contrib.test_utils.bt.bt_constants import pairing_variant_passkey_confirmation
-from acts_contrib.test_utils.bt.bt_constants import pan_connect_timeout
-from acts_contrib.test_utils.bt.bt_constants import sample_rates
-from acts_contrib.test_utils.bt.bt_constants import scan_result
-from acts_contrib.test_utils.bt.bt_constants import sig_uuid_constants
-from acts_contrib.test_utils.bt.bt_constants import small_timeout
-from acts_contrib.test_utils.tel.tel_test_utils import toggle_airplane_mode_by_adb
-from acts_contrib.test_utils.tel.tel_test_utils import verify_http_connection
+from acts.test_utils.bt.bt_constants import bluetooth_socket_conn_test_uuid
+from acts.test_utils.bt.bt_constants import bt_default_timeout
+from acts.test_utils.bt.bt_constants import bt_profile_constants
+from acts.test_utils.bt.bt_constants import bt_profile_states
+from acts.test_utils.bt.bt_constants import bt_rfcomm_uuids
+from acts.test_utils.bt.bt_constants import bt_scan_mode_types
+from acts.test_utils.bt.bt_constants import btsnoop_last_log_path_on_device
+from acts.test_utils.bt.bt_constants import btsnoop_log_path_on_device
+from acts.test_utils.bt.bt_constants import channel_modes
+from acts.test_utils.bt.bt_constants import codec_types
+from acts.test_utils.bt.bt_constants import default_bluetooth_socket_timeout_ms
+from acts.test_utils.bt.bt_constants import default_rfcomm_timeout_ms
+from acts.test_utils.bt.bt_constants import hid_id_keyboard
+from acts.test_utils.bt.bt_constants import pairing_variant_passkey_confirmation
+from acts.test_utils.bt.bt_constants import pan_connect_timeout
+from acts.test_utils.bt.bt_constants import sample_rates
+from acts.test_utils.bt.bt_constants import scan_result
+from acts.test_utils.bt.bt_constants import sig_uuid_constants
+from acts.test_utils.bt.bt_constants import small_timeout
+from acts.test_utils.tel.tel_test_utils import toggle_airplane_mode_by_adb
+from acts.test_utils.tel.tel_test_utils import verify_http_connection
from acts.utils import exe_cmd
from acts import utils
diff --git a/acts_tests/acts_contrib/test_utils/bt/bta_lib.py b/acts/framework/acts/test_utils/bt/bta_lib.py
similarity index 95%
rename from acts_tests/acts_contrib/test_utils/bt/bta_lib.py
rename to acts/framework/acts/test_utils/bt/bta_lib.py
index 6c3be78..17d7601 100644
--- a/acts_tests/acts_contrib/test_utils/bt/bta_lib.py
+++ b/acts/framework/acts/test_utils/bt/bta_lib.py
@@ -17,8 +17,8 @@
Bluetooth adapter libraries
"""
-from acts_contrib.test_utils.bt.bt_constants import bt_scan_mode_types
-from acts_contrib.test_utils.bt.bt_test_utils import set_bt_scan_mode
+from acts.test_utils.bt.bt_constants import bt_scan_mode_types
+from acts.test_utils.bt.bt_test_utils import set_bt_scan_mode
import pprint
diff --git a/acts_tests/acts_contrib/test_utils/bt/config_lib.py b/acts/framework/acts/test_utils/bt/config_lib.py
similarity index 86%
rename from acts_tests/acts_contrib/test_utils/bt/config_lib.py
rename to acts/framework/acts/test_utils/bt/config_lib.py
index 2926243..927abb3 100644
--- a/acts_tests/acts_contrib/test_utils/bt/config_lib.py
+++ b/acts/framework/acts/test_utils/bt/config_lib.py
@@ -17,10 +17,10 @@
Bluetooth Config Pusher
"""
-from acts_contrib.test_utils.bt.bt_gatt_utils import disconnect_gatt_connection
-from acts_contrib.test_utils.bt.bt_gatt_utils import setup_gatt_connection
-from acts_contrib.test_utils.bt.bt_gatt_utils import setup_gatt_mtu
-from acts_contrib.test_utils.bt.bt_gatt_utils import log_gatt_server_uuids
+from acts.test_utils.bt.bt_gatt_utils import disconnect_gatt_connection
+from acts.test_utils.bt.bt_gatt_utils import setup_gatt_connection
+from acts.test_utils.bt.bt_gatt_utils import setup_gatt_mtu
+from acts.test_utils.bt.bt_gatt_utils import log_gatt_server_uuids
import time
import os
diff --git a/acts_tests/acts_contrib/test_utils/bt/configs/bt_stack.conf b/acts/framework/acts/test_utils/bt/configs/bt_stack.conf
similarity index 100%
rename from acts_tests/acts_contrib/test_utils/bt/configs/bt_stack.conf
rename to acts/framework/acts/test_utils/bt/configs/bt_stack.conf
diff --git a/acts_tests/acts_contrib/test_utils/bt/configs/dis_mitm_bt_stack.conf b/acts/framework/acts/test_utils/bt/configs/dis_mitm_bt_stack.conf
similarity index 100%
rename from acts_tests/acts_contrib/test_utils/bt/configs/dis_mitm_bt_stack.conf
rename to acts/framework/acts/test_utils/bt/configs/dis_mitm_bt_stack.conf
diff --git a/acts_tests/acts_contrib/test_utils/bt/configs/non_bond_bt_stack.conf b/acts/framework/acts/test_utils/bt/configs/non_bond_bt_stack.conf
similarity index 100%
rename from acts_tests/acts_contrib/test_utils/bt/configs/non_bond_bt_stack.conf
rename to acts/framework/acts/test_utils/bt/configs/non_bond_bt_stack.conf
diff --git a/acts_tests/acts_contrib/test_utils/bt/gatt_test_database.py b/acts/framework/acts/test_utils/bt/gatt_test_database.py
similarity index 99%
rename from acts_tests/acts_contrib/test_utils/bt/gatt_test_database.py
rename to acts/framework/acts/test_utils/bt/gatt_test_database.py
index 8c4f54c..9f76af4 100644
--- a/acts_tests/acts_contrib/test_utils/bt/gatt_test_database.py
+++ b/acts/framework/acts/test_utils/bt/gatt_test_database.py
@@ -14,12 +14,12 @@
# License for the specific language governing permissions and limitations under
# the License.
-from acts_contrib.test_utils.bt.bt_constants import gatt_characteristic
-from acts_contrib.test_utils.bt.bt_constants import gatt_descriptor
-from acts_contrib.test_utils.bt.bt_constants import gatt_service_types
-from acts_contrib.test_utils.bt.bt_constants import gatt_char_types
-from acts_contrib.test_utils.bt.bt_constants import gatt_characteristic_value_format
-from acts_contrib.test_utils.bt.bt_constants import gatt_char_desc_uuids
+from acts.test_utils.bt.bt_constants import gatt_characteristic
+from acts.test_utils.bt.bt_constants import gatt_descriptor
+from acts.test_utils.bt.bt_constants import gatt_service_types
+from acts.test_utils.bt.bt_constants import gatt_char_types
+from acts.test_utils.bt.bt_constants import gatt_characteristic_value_format
+from acts.test_utils.bt.bt_constants import gatt_char_desc_uuids
STRING_512BYTES = '''
11111222223333344444555556666677777888889999900000
diff --git a/acts_tests/acts_contrib/test_utils/bt/gattc_lib.py b/acts/framework/acts/test_utils/bt/gattc_lib.py
similarity index 95%
rename from acts_tests/acts_contrib/test_utils/bt/gattc_lib.py
rename to acts/framework/acts/test_utils/bt/gattc_lib.py
index 86f0950..1aba5eb 100644
--- a/acts_tests/acts_contrib/test_utils/bt/gattc_lib.py
+++ b/acts/framework/acts/test_utils/bt/gattc_lib.py
@@ -17,20 +17,20 @@
GATT Client Libraries
"""
-from acts_contrib.test_utils.bt.bt_constants import default_le_connection_interval_ms
-from acts_contrib.test_utils.bt.bt_constants import default_bluetooth_socket_timeout_ms
-from acts_contrib.test_utils.bt.bt_gatt_utils import disconnect_gatt_connection
-from acts_contrib.test_utils.bt.bt_gatt_utils import setup_gatt_connection
-from acts_contrib.test_utils.bt.bt_gatt_utils import setup_gatt_mtu
-from acts_contrib.test_utils.bt.bt_constants import ble_scan_settings_modes
-from acts_contrib.test_utils.bt.bt_constants import gatt_cb_strings
-from acts_contrib.test_utils.bt.bt_constants import gatt_char_desc_uuids
-from acts_contrib.test_utils.bt.bt_constants import gatt_descriptor
-from acts_contrib.test_utils.bt.bt_constants import gatt_transport
-from acts_contrib.test_utils.bt.bt_constants import le_default_supervision_timeout
-from acts_contrib.test_utils.bt.bt_constants import le_connection_interval_time_step_ms
-from acts_contrib.test_utils.bt.bt_constants import scan_result
-from acts_contrib.test_utils.bt.bt_gatt_utils import log_gatt_server_uuids
+from acts.test_utils.bt.bt_constants import default_le_connection_interval_ms
+from acts.test_utils.bt.bt_constants import default_bluetooth_socket_timeout_ms
+from acts.test_utils.bt.bt_gatt_utils import disconnect_gatt_connection
+from acts.test_utils.bt.bt_gatt_utils import setup_gatt_connection
+from acts.test_utils.bt.bt_gatt_utils import setup_gatt_mtu
+from acts.test_utils.bt.bt_constants import ble_scan_settings_modes
+from acts.test_utils.bt.bt_constants import gatt_cb_strings
+from acts.test_utils.bt.bt_constants import gatt_char_desc_uuids
+from acts.test_utils.bt.bt_constants import gatt_descriptor
+from acts.test_utils.bt.bt_constants import gatt_transport
+from acts.test_utils.bt.bt_constants import le_default_supervision_timeout
+from acts.test_utils.bt.bt_constants import le_connection_interval_time_step_ms
+from acts.test_utils.bt.bt_constants import scan_result
+from acts.test_utils.bt.bt_gatt_utils import log_gatt_server_uuids
import time
import os
diff --git a/acts_tests/acts_contrib/test_utils/bt/gatts_lib.py b/acts/framework/acts/test_utils/bt/gatts_lib.py
similarity index 95%
rename from acts_tests/acts_contrib/test_utils/bt/gatts_lib.py
rename to acts/framework/acts/test_utils/bt/gatts_lib.py
index ebfe1bd..483adf2 100644
--- a/acts_tests/acts_contrib/test_utils/bt/gatts_lib.py
+++ b/acts/framework/acts/test_utils/bt/gatts_lib.py
@@ -19,16 +19,16 @@
from acts.keys import Config
from acts.utils import rand_ascii_str
-from acts_contrib.test_utils.bt.bt_constants import gatt_cb_strings
-from acts_contrib.test_utils.bt.bt_constants import gatt_characteristic
-from acts_contrib.test_utils.bt.bt_constants import gatt_characteristic_value_format
-from acts_contrib.test_utils.bt.bt_constants import gatt_cb_err
-from acts_contrib.test_utils.bt.bt_constants import gatt_transport
-from acts_contrib.test_utils.bt.bt_constants import gatt_event
-from acts_contrib.test_utils.bt.bt_constants import gatt_server_responses
-from acts_contrib.test_utils.bt.bt_constants import gatt_service_types
-from acts_contrib.test_utils.bt.bt_constants import small_timeout
-from acts_contrib.test_utils.bt.gatt_test_database import STRING_512BYTES
+from acts.test_utils.bt.bt_constants import gatt_cb_strings
+from acts.test_utils.bt.bt_constants import gatt_characteristic
+from acts.test_utils.bt.bt_constants import gatt_characteristic_value_format
+from acts.test_utils.bt.bt_constants import gatt_cb_err
+from acts.test_utils.bt.bt_constants import gatt_transport
+from acts.test_utils.bt.bt_constants import gatt_event
+from acts.test_utils.bt.bt_constants import gatt_server_responses
+from acts.test_utils.bt.bt_constants import gatt_service_types
+from acts.test_utils.bt.bt_constants import small_timeout
+from acts.test_utils.bt.gatt_test_database import STRING_512BYTES
from acts.utils import exe_cmd
from math import ceil
diff --git a/acts_tests/acts_contrib/test_utils/bt/loggers/__init__.py b/acts/framework/acts/test_utils/bt/loggers/__init__.py
similarity index 100%
rename from acts_tests/acts_contrib/test_utils/bt/loggers/__init__.py
rename to acts/framework/acts/test_utils/bt/loggers/__init__.py
diff --git a/acts_tests/acts_contrib/test_utils/bt/loggers/bluetooth_metric_logger.py b/acts/framework/acts/test_utils/bt/loggers/bluetooth_metric_logger.py
similarity index 98%
rename from acts_tests/acts_contrib/test_utils/bt/loggers/bluetooth_metric_logger.py
rename to acts/framework/acts/test_utils/bt/loggers/bluetooth_metric_logger.py
index 98c925e..9221193 100644
--- a/acts_tests/acts_contrib/test_utils/bt/loggers/bluetooth_metric_logger.py
+++ b/acts/framework/acts/test_utils/bt/loggers/bluetooth_metric_logger.py
@@ -21,7 +21,7 @@
from acts.metrics.core import ProtoMetric
from acts.metrics.logger import MetricLogger
-from acts_contrib.test_utils.bt.loggers.protos import bluetooth_metric_pb2
+from acts.test_utils.bt.loggers.protos import bluetooth_metric_pb2
def recursive_assign(proto, dct):
diff --git a/acts_tests/acts_contrib/test_utils/bt/loggers/protos/__init__.py b/acts/framework/acts/test_utils/bt/loggers/protos/__init__.py
similarity index 100%
rename from acts_tests/acts_contrib/test_utils/bt/loggers/protos/__init__.py
rename to acts/framework/acts/test_utils/bt/loggers/protos/__init__.py
diff --git a/acts_tests/acts_contrib/test_utils/bt/loggers/protos/bluetooth_metric.proto b/acts/framework/acts/test_utils/bt/loggers/protos/bluetooth_metric.proto
similarity index 100%
rename from acts_tests/acts_contrib/test_utils/bt/loggers/protos/bluetooth_metric.proto
rename to acts/framework/acts/test_utils/bt/loggers/protos/bluetooth_metric.proto
diff --git a/acts_tests/acts_contrib/test_utils/bt/loggers/protos/bluetooth_metric_pb2.py b/acts/framework/acts/test_utils/bt/loggers/protos/bluetooth_metric_pb2.py
similarity index 70%
rename from acts_tests/acts_contrib/test_utils/bt/loggers/protos/bluetooth_metric_pb2.py
rename to acts/framework/acts/test_utils/bt/loggers/protos/bluetooth_metric_pb2.py
index d3c0a9f..8cd8f30 100644
--- a/acts_tests/acts_contrib/test_utils/bt/loggers/protos/bluetooth_metric_pb2.py
+++ b/acts/framework/acts/test_utils/bt/loggers/protos/bluetooth_metric_pb2.py
@@ -1,11 +1,13 @@
-# -*- coding: utf-8 -*-
# Generated by the protocol buffer compiler. DO NOT EDIT!
# source: bluetooth_metric.proto
-"""Generated protocol buffer code."""
+
+import sys
+_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1'))
from google.protobuf import descriptor as _descriptor
from google.protobuf import message as _message
from google.protobuf import reflection as _reflection
from google.protobuf import symbol_database as _symbol_database
+from google.protobuf import descriptor_pb2
# @@protoc_insertion_point(imports)
_sym_db = _symbol_database.Default()
@@ -17,10 +19,9 @@
name='bluetooth_metric.proto',
package='wireless.android.platform.testing.bluetooth.metrics',
syntax='proto2',
- serialized_options=None,
- create_key=_descriptor._internal_create_key,
- serialized_pb=b'\n\x16\x62luetooth_metric.proto\x12\x33wireless.android.platform.testing.bluetooth.metrics\"\xe8\x01\n\x13\x42luetoothTestDevice\x12\x14\n\x0c\x64\x65vice_class\x18\x01 \x01(\t\x12\x14\n\x0c\x64\x65vice_model\x18\x02 \x01(\t\x12\x18\n\x10hardware_version\x18\x03 \x01(\t\x12\x18\n\x10software_version\x18\x04 \x01(\t\x12\x1a\n\x12\x61ndroid_build_type\x18\x05 \x01(\t\x12\x1b\n\x13\x61ndroid_branch_name\x18\x06 \x01(\t\x12\x1c\n\x14\x61ndroid_build_number\x18\x07 \x01(\t\x12\x1a\n\x12\x61ndroid_release_id\x18\x08 \x01(\t\"\x83\x02\n#BluetoothContinuousTestResultHeader\x12\x16\n\x0etest_date_time\x18\x01 \x01(\x03\x12`\n\x0eprimary_device\x18\x02 \x01(\x0b\x32H.wireless.android.platform.testing.bluetooth.metrics.BluetoothTestDevice\x12\x62\n\x10\x63onnected_device\x18\x03 \x01(\x0b\x32H.wireless.android.platform.testing.bluetooth.metrics.BluetoothTestDevice\"\xe0\x03\n\x1c\x42luetoothReconnectTestResult\x12t\n\x12\x63onfiguration_data\x18\x01 \x01(\x0b\x32X.wireless.android.platform.testing.bluetooth.metrics.BluetoothContinuousTestResultHeader\x12 \n\x18\x63onnection_attempt_count\x18\x02 \x01(\x05\x12#\n\x1b\x63onnection_successful_count\x18\x03 \x01(\x05\x12\x1f\n\x17\x63onnection_failed_count\x18\x04 \x01(\x05\x12\"\n\x1a\x63onnection_max_time_millis\x18\x05 \x01(\x05\x12\"\n\x1a\x63onnection_min_time_millis\x18\x06 \x01(\x05\x12\"\n\x1a\x63onnection_avg_time_millis\x18\x07 \x01(\x05\x12&\n\x1e\x61\x63l_connection_max_time_millis\x18\x08 \x01(\x05\x12&\n\x1e\x61\x63l_connection_min_time_millis\x18\t \x01(\x05\x12&\n\x1e\x61\x63l_connection_avg_time_millis\x18\n \x01(\x05\"\xc7\x03\n!BluetoothPairAndConnectTestResult\x12t\n\x12\x63onfiguration_data\x18\x01 \x01(\x0b\x32X.wireless.android.platform.testing.bluetooth.metrics.BluetoothContinuousTestResultHeader\x12\x1a\n\x12pair_attempt_count\x18\x02 \x01(\x05\x12\x1d\n\x15pair_successful_count\x18\x03 \x01(\x05\x12\x19\n\x11pair_failed_count\x18\x04 \x01(\x05\x12\x1c\n\x14pair_max_time_millis\x18\x05 \x01(\x05\x12\x1c\n\x14pair_min_time_millis\x18\x06 \x01(\x05\x12\x1c\n\x14pair_avg_time_millis\x18\x07 \x01(\x05\x12(\n first_connection_max_time_millis\x18\x08 \x01(\x05\x12(\n first_connection_min_time_millis\x18\t \x01(\x05\x12(\n first_connection_avg_time_millis\x18\n \x01(\x05\"\x9d\x02\n\x18\x42luetoothA2dpCodecConfig\x12t\n\ncodec_type\x18\x01 \x01(\x0e\x32`.wireless.android.platform.testing.bluetooth.metrics.BluetoothA2dpCodecConfig.BluetoothA2dpCodec\x12\x13\n\x0bsample_rate\x18\x02 \x01(\x05\x12\x17\n\x0f\x62its_per_sample\x18\x03 \x01(\x05\x12\x14\n\x0c\x63hannel_mode\x18\x04 \x01(\x05\"G\n\x12\x42luetoothA2dpCodec\x12\x07\n\x03SBC\x10\x00\x12\x07\n\x03\x41\x41\x43\x10\x01\x12\x08\n\x04\x41PTX\x10\x02\x12\x0b\n\x07\x41PTX_HD\x10\x03\x12\x08\n\x04LDAC\x10\x04\"\xdb\x01\n\x12\x41udioTestDataPoint\x12\x30\n(timestamp_since_beginning_of_test_millis\x18\x01 \x01(\x03\x12\'\n\x1f\x61udio_streaming_duration_millis\x18\x02 \x01(\x03\x12\x16\n\x0e\x61ttenuation_db\x18\x03 \x01(\x05\x12\x34\n,total_harmonic_distortion_plus_noise_percent\x18\x04 \x01(\x02\x12\x1c\n\x14\x61udio_glitches_count\x18\x05 \x01(\x05\"\xf6\x05\n\x18\x42luetoothAudioTestResult\x12t\n\x12\x63onfiguration_data\x18\x01 \x01(\x0b\x32X.wireless.android.platform.testing.bluetooth.metrics.BluetoothContinuousTestResultHeader\x12q\n\raudio_profile\x18\x02 \x01(\x0e\x32Z.wireless.android.platform.testing.bluetooth.metrics.BluetoothAudioTestResult.AudioProfile\x12 \n\x18\x61udio_latency_min_millis\x18\x03 \x01(\x05\x12 \n\x18\x61udio_latency_max_millis\x18\x04 \x01(\x05\x12 \n\x18\x61udio_latency_avg_millis\x18\x05 \x01(\x05\x12\x1c\n\x14\x61udio_glitches_count\x18\x06 \x01(\x05\x12\"\n\x1a\x61udio_missed_packets_count\x18\x07 \x01(\x05\x12,\n$total_harmonic_distortion_plus_noise\x18\x08 \x01(\x02\x12\'\n\x1f\x61udio_streaming_duration_millis\x18\t \x01(\x03\x12h\n\x11\x61\x32\x64p_codec_config\x18\n \x01(\x0b\x32M.wireless.android.platform.testing.bluetooth.metrics.BluetoothA2dpCodecConfig\x12\\\n\x0b\x64\x61ta_points\x18\x0b \x03(\x0b\x32G.wireless.android.platform.testing.bluetooth.metrics.AudioTestDataPoint\"*\n\x0c\x41udioProfile\x12\x08\n\x04\x41\x32\x44P\x10\x00\x12\x07\n\x03HFP\x10\x01\x12\x07\n\x03HAP\x10\x02\"\xd5\x04\n\x17\x42luetoothDataTestResult\x12t\n\x12\x63onfiguration_data\x18\x01 \x01(\x0b\x32X.wireless.android.platform.testing.bluetooth.metrics.BluetoothContinuousTestResultHeader\x12\x81\x01\n\x16\x64\x61ta_transfer_protocol\x18\x02 \x01(\x0e\x32\x61.wireless.android.platform.testing.bluetooth.metrics.BluetoothDataTestResult.DataTransferProtocol\x12\x1f\n\x17\x64\x61ta_latency_min_millis\x18\x03 \x01(\x05\x12\x1f\n\x17\x64\x61ta_latency_max_millis\x18\x04 \x01(\x05\x12\x1f\n\x17\x64\x61ta_latency_avg_millis\x18\x05 \x01(\x05\x12,\n$data_throughput_min_bytes_per_second\x18\x06 \x01(\x05\x12,\n$data_throughput_max_bytes_per_second\x18\x07 \x01(\x05\x12,\n$data_throughput_avg_bytes_per_second\x18\x08 \x01(\x05\x12\x18\n\x10\x64\x61ta_packet_size\x18\t \x01(\x05\"9\n\x14\x44\x61taTransferProtocol\x12\n\n\x06RFCOMM\x10\x00\x12\t\n\x05L2CAP\x10\x01\x12\n\n\x06LE_COC\x10\x02'
+ serialized_pb=_b('\n\x16\x62luetooth_metric.proto\x12\x33wireless.android.platform.testing.bluetooth.metrics\"\xe8\x01\n\x13\x42luetoothTestDevice\x12\x14\n\x0c\x64\x65vice_class\x18\x01 \x01(\t\x12\x14\n\x0c\x64\x65vice_model\x18\x02 \x01(\t\x12\x18\n\x10hardware_version\x18\x03 \x01(\t\x12\x18\n\x10software_version\x18\x04 \x01(\t\x12\x1a\n\x12\x61ndroid_build_type\x18\x05 \x01(\t\x12\x1b\n\x13\x61ndroid_branch_name\x18\x06 \x01(\t\x12\x1c\n\x14\x61ndroid_build_number\x18\x07 \x01(\t\x12\x1a\n\x12\x61ndroid_release_id\x18\x08 \x01(\t\"\x83\x02\n#BluetoothContinuousTestResultHeader\x12\x16\n\x0etest_date_time\x18\x01 \x01(\x03\x12`\n\x0eprimary_device\x18\x02 \x01(\x0b\x32H.wireless.android.platform.testing.bluetooth.metrics.BluetoothTestDevice\x12\x62\n\x10\x63onnected_device\x18\x03 \x01(\x0b\x32H.wireless.android.platform.testing.bluetooth.metrics.BluetoothTestDevice\"\xe0\x03\n\x1c\x42luetoothReconnectTestResult\x12t\n\x12\x63onfiguration_data\x18\x01 \x01(\x0b\x32X.wireless.android.platform.testing.bluetooth.metrics.BluetoothContinuousTestResultHeader\x12 \n\x18\x63onnection_attempt_count\x18\x02 \x01(\x05\x12#\n\x1b\x63onnection_successful_count\x18\x03 \x01(\x05\x12\x1f\n\x17\x63onnection_failed_count\x18\x04 \x01(\x05\x12\"\n\x1a\x63onnection_max_time_millis\x18\x05 \x01(\x05\x12\"\n\x1a\x63onnection_min_time_millis\x18\x06 \x01(\x05\x12\"\n\x1a\x63onnection_avg_time_millis\x18\x07 \x01(\x05\x12&\n\x1e\x61\x63l_connection_max_time_millis\x18\x08 \x01(\x05\x12&\n\x1e\x61\x63l_connection_min_time_millis\x18\t \x01(\x05\x12&\n\x1e\x61\x63l_connection_avg_time_millis\x18\n \x01(\x05\"\xc7\x03\n!BluetoothPairAndConnectTestResult\x12t\n\x12\x63onfiguration_data\x18\x01 \x01(\x0b\x32X.wireless.android.platform.testing.bluetooth.metrics.BluetoothContinuousTestResultHeader\x12\x1a\n\x12pair_attempt_count\x18\x02 \x01(\x05\x12\x1d\n\x15pair_successful_count\x18\x03 \x01(\x05\x12\x19\n\x11pair_failed_count\x18\x04 \x01(\x05\x12\x1c\n\x14pair_max_time_millis\x18\x05 \x01(\x05\x12\x1c\n\x14pair_min_time_millis\x18\x06 \x01(\x05\x12\x1c\n\x14pair_avg_time_millis\x18\x07 \x01(\x05\x12(\n first_connection_max_time_millis\x18\x08 \x01(\x05\x12(\n first_connection_min_time_millis\x18\t \x01(\x05\x12(\n first_connection_avg_time_millis\x18\n \x01(\x05\"\x9d\x02\n\x18\x42luetoothA2dpCodecConfig\x12t\n\ncodec_type\x18\x01 \x01(\x0e\x32`.wireless.android.platform.testing.bluetooth.metrics.BluetoothA2dpCodecConfig.BluetoothA2dpCodec\x12\x13\n\x0bsample_rate\x18\x02 \x01(\x05\x12\x17\n\x0f\x62its_per_sample\x18\x03 \x01(\x05\x12\x14\n\x0c\x63hannel_mode\x18\x04 \x01(\x05\"G\n\x12\x42luetoothA2dpCodec\x12\x07\n\x03SBC\x10\x00\x12\x07\n\x03\x41\x41\x43\x10\x01\x12\x08\n\x04\x41PTX\x10\x02\x12\x0b\n\x07\x41PTX_HD\x10\x03\x12\x08\n\x04LDAC\x10\x04\"\xdb\x01\n\x12\x41udioTestDataPoint\x12\x30\n(timestamp_since_beginning_of_test_millis\x18\x01 \x01(\x03\x12\'\n\x1f\x61udio_streaming_duration_millis\x18\x02 \x01(\x03\x12\x16\n\x0e\x61ttenuation_db\x18\x03 \x01(\x05\x12\x34\n,total_harmonic_distortion_plus_noise_percent\x18\x04 \x01(\x02\x12\x1c\n\x14\x61udio_glitches_count\x18\x05 \x01(\x05\"\xf6\x05\n\x18\x42luetoothAudioTestResult\x12t\n\x12\x63onfiguration_data\x18\x01 \x01(\x0b\x32X.wireless.android.platform.testing.bluetooth.metrics.BluetoothContinuousTestResultHeader\x12q\n\raudio_profile\x18\x02 \x01(\x0e\x32Z.wireless.android.platform.testing.bluetooth.metrics.BluetoothAudioTestResult.AudioProfile\x12 \n\x18\x61udio_latency_min_millis\x18\x03 \x01(\x05\x12 \n\x18\x61udio_latency_max_millis\x18\x04 \x01(\x05\x12 \n\x18\x61udio_latency_avg_millis\x18\x05 \x01(\x05\x12\x1c\n\x14\x61udio_glitches_count\x18\x06 \x01(\x05\x12\"\n\x1a\x61udio_missed_packets_count\x18\x07 \x01(\x05\x12,\n$total_harmonic_distortion_plus_noise\x18\x08 \x01(\x02\x12\'\n\x1f\x61udio_streaming_duration_millis\x18\t \x01(\x03\x12h\n\x11\x61\x32\x64p_codec_config\x18\n \x01(\x0b\x32M.wireless.android.platform.testing.bluetooth.metrics.BluetoothA2dpCodecConfig\x12\\\n\x0b\x64\x61ta_points\x18\x0b \x03(\x0b\x32G.wireless.android.platform.testing.bluetooth.metrics.AudioTestDataPoint\"*\n\x0c\x41udioProfile\x12\x08\n\x04\x41\x32\x44P\x10\x00\x12\x07\n\x03HFP\x10\x01\x12\x07\n\x03HAP\x10\x02\"\xd5\x04\n\x17\x42luetoothDataTestResult\x12t\n\x12\x63onfiguration_data\x18\x01 \x01(\x0b\x32X.wireless.android.platform.testing.bluetooth.metrics.BluetoothContinuousTestResultHeader\x12\x81\x01\n\x16\x64\x61ta_transfer_protocol\x18\x02 \x01(\x0e\x32\x61.wireless.android.platform.testing.bluetooth.metrics.BluetoothDataTestResult.DataTransferProtocol\x12\x1f\n\x17\x64\x61ta_latency_min_millis\x18\x03 \x01(\x05\x12\x1f\n\x17\x64\x61ta_latency_max_millis\x18\x04 \x01(\x05\x12\x1f\n\x17\x64\x61ta_latency_avg_millis\x18\x05 \x01(\x05\x12,\n$data_throughput_min_bytes_per_second\x18\x06 \x01(\x05\x12,\n$data_throughput_max_bytes_per_second\x18\x07 \x01(\x05\x12,\n$data_throughput_avg_bytes_per_second\x18\x08 \x01(\x05\x12\x18\n\x10\x64\x61ta_packet_size\x18\t \x01(\x05\"9\n\x14\x44\x61taTransferProtocol\x12\n\n\x06RFCOMM\x10\x00\x12\t\n\x05L2CAP\x10\x01\x12\n\n\x06LE_COC\x10\x02')
)
+_sym_db.RegisterFileDescriptor(DESCRIPTOR)
@@ -29,36 +30,30 @@
full_name='wireless.android.platform.testing.bluetooth.metrics.BluetoothA2dpCodecConfig.BluetoothA2dpCodec',
filename=None,
file=DESCRIPTOR,
- create_key=_descriptor._internal_create_key,
values=[
_descriptor.EnumValueDescriptor(
name='SBC', index=0, number=0,
- serialized_options=None,
- type=None,
- create_key=_descriptor._internal_create_key),
+ options=None,
+ type=None),
_descriptor.EnumValueDescriptor(
name='AAC', index=1, number=1,
- serialized_options=None,
- type=None,
- create_key=_descriptor._internal_create_key),
+ options=None,
+ type=None),
_descriptor.EnumValueDescriptor(
name='APTX', index=2, number=2,
- serialized_options=None,
- type=None,
- create_key=_descriptor._internal_create_key),
+ options=None,
+ type=None),
_descriptor.EnumValueDescriptor(
name='APTX_HD', index=3, number=3,
- serialized_options=None,
- type=None,
- create_key=_descriptor._internal_create_key),
+ options=None,
+ type=None),
_descriptor.EnumValueDescriptor(
name='LDAC', index=4, number=4,
- serialized_options=None,
- type=None,
- create_key=_descriptor._internal_create_key),
+ options=None,
+ type=None),
],
containing_type=None,
- serialized_options=None,
+ options=None,
serialized_start=1732,
serialized_end=1803,
)
@@ -69,26 +64,22 @@
full_name='wireless.android.platform.testing.bluetooth.metrics.BluetoothAudioTestResult.AudioProfile',
filename=None,
file=DESCRIPTOR,
- create_key=_descriptor._internal_create_key,
values=[
_descriptor.EnumValueDescriptor(
name='A2DP', index=0, number=0,
- serialized_options=None,
- type=None,
- create_key=_descriptor._internal_create_key),
+ options=None,
+ type=None),
_descriptor.EnumValueDescriptor(
name='HFP', index=1, number=1,
- serialized_options=None,
- type=None,
- create_key=_descriptor._internal_create_key),
+ options=None,
+ type=None),
_descriptor.EnumValueDescriptor(
name='HAP', index=2, number=2,
- serialized_options=None,
- type=None,
- create_key=_descriptor._internal_create_key),
+ options=None,
+ type=None),
],
containing_type=None,
- serialized_options=None,
+ options=None,
serialized_start=2744,
serialized_end=2786,
)
@@ -99,26 +90,22 @@
full_name='wireless.android.platform.testing.bluetooth.metrics.BluetoothDataTestResult.DataTransferProtocol',
filename=None,
file=DESCRIPTOR,
- create_key=_descriptor._internal_create_key,
values=[
_descriptor.EnumValueDescriptor(
name='RFCOMM', index=0, number=0,
- serialized_options=None,
- type=None,
- create_key=_descriptor._internal_create_key),
+ options=None,
+ type=None),
_descriptor.EnumValueDescriptor(
name='L2CAP', index=1, number=1,
- serialized_options=None,
- type=None,
- create_key=_descriptor._internal_create_key),
+ options=None,
+ type=None),
_descriptor.EnumValueDescriptor(
name='LE_COC', index=2, number=2,
- serialized_options=None,
- type=None,
- create_key=_descriptor._internal_create_key),
+ options=None,
+ type=None),
],
containing_type=None,
- serialized_options=None,
+ options=None,
serialized_start=3329,
serialized_end=3386,
)
@@ -131,71 +118,70 @@
filename=None,
file=DESCRIPTOR,
containing_type=None,
- create_key=_descriptor._internal_create_key,
fields=[
_descriptor.FieldDescriptor(
name='device_class', full_name='wireless.android.platform.testing.bluetooth.metrics.BluetoothTestDevice.device_class', index=0,
number=1, type=9, cpp_type=9, label=1,
- has_default_value=False, default_value=b"".decode('utf-8'),
+ has_default_value=False, default_value=_b("").decode('utf-8'),
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ options=None),
_descriptor.FieldDescriptor(
name='device_model', full_name='wireless.android.platform.testing.bluetooth.metrics.BluetoothTestDevice.device_model', index=1,
number=2, type=9, cpp_type=9, label=1,
- has_default_value=False, default_value=b"".decode('utf-8'),
+ has_default_value=False, default_value=_b("").decode('utf-8'),
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ options=None),
_descriptor.FieldDescriptor(
name='hardware_version', full_name='wireless.android.platform.testing.bluetooth.metrics.BluetoothTestDevice.hardware_version', index=2,
number=3, type=9, cpp_type=9, label=1,
- has_default_value=False, default_value=b"".decode('utf-8'),
+ has_default_value=False, default_value=_b("").decode('utf-8'),
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ options=None),
_descriptor.FieldDescriptor(
name='software_version', full_name='wireless.android.platform.testing.bluetooth.metrics.BluetoothTestDevice.software_version', index=3,
number=4, type=9, cpp_type=9, label=1,
- has_default_value=False, default_value=b"".decode('utf-8'),
+ has_default_value=False, default_value=_b("").decode('utf-8'),
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ options=None),
_descriptor.FieldDescriptor(
name='android_build_type', full_name='wireless.android.platform.testing.bluetooth.metrics.BluetoothTestDevice.android_build_type', index=4,
number=5, type=9, cpp_type=9, label=1,
- has_default_value=False, default_value=b"".decode('utf-8'),
+ has_default_value=False, default_value=_b("").decode('utf-8'),
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ options=None),
_descriptor.FieldDescriptor(
name='android_branch_name', full_name='wireless.android.platform.testing.bluetooth.metrics.BluetoothTestDevice.android_branch_name', index=5,
number=6, type=9, cpp_type=9, label=1,
- has_default_value=False, default_value=b"".decode('utf-8'),
+ has_default_value=False, default_value=_b("").decode('utf-8'),
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ options=None),
_descriptor.FieldDescriptor(
name='android_build_number', full_name='wireless.android.platform.testing.bluetooth.metrics.BluetoothTestDevice.android_build_number', index=6,
number=7, type=9, cpp_type=9, label=1,
- has_default_value=False, default_value=b"".decode('utf-8'),
+ has_default_value=False, default_value=_b("").decode('utf-8'),
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ options=None),
_descriptor.FieldDescriptor(
name='android_release_id', full_name='wireless.android.platform.testing.bluetooth.metrics.BluetoothTestDevice.android_release_id', index=7,
number=8, type=9, cpp_type=9, label=1,
- has_default_value=False, default_value=b"".decode('utf-8'),
+ has_default_value=False, default_value=_b("").decode('utf-8'),
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ options=None),
],
extensions=[
],
nested_types=[],
enum_types=[
],
- serialized_options=None,
+ options=None,
is_extendable=False,
syntax='proto2',
extension_ranges=[],
@@ -212,7 +198,6 @@
filename=None,
file=DESCRIPTOR,
containing_type=None,
- create_key=_descriptor._internal_create_key,
fields=[
_descriptor.FieldDescriptor(
name='test_date_time', full_name='wireless.android.platform.testing.bluetooth.metrics.BluetoothContinuousTestResultHeader.test_date_time', index=0,
@@ -220,28 +205,28 @@
has_default_value=False, default_value=0,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ options=None),
_descriptor.FieldDescriptor(
name='primary_device', full_name='wireless.android.platform.testing.bluetooth.metrics.BluetoothContinuousTestResultHeader.primary_device', index=1,
number=2, type=11, cpp_type=10, label=1,
has_default_value=False, default_value=None,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ options=None),
_descriptor.FieldDescriptor(
name='connected_device', full_name='wireless.android.platform.testing.bluetooth.metrics.BluetoothContinuousTestResultHeader.connected_device', index=2,
number=3, type=11, cpp_type=10, label=1,
has_default_value=False, default_value=None,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ options=None),
],
extensions=[
],
nested_types=[],
enum_types=[
],
- serialized_options=None,
+ options=None,
is_extendable=False,
syntax='proto2',
extension_ranges=[],
@@ -258,7 +243,6 @@
filename=None,
file=DESCRIPTOR,
containing_type=None,
- create_key=_descriptor._internal_create_key,
fields=[
_descriptor.FieldDescriptor(
name='configuration_data', full_name='wireless.android.platform.testing.bluetooth.metrics.BluetoothReconnectTestResult.configuration_data', index=0,
@@ -266,77 +250,77 @@
has_default_value=False, default_value=None,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ options=None),
_descriptor.FieldDescriptor(
name='connection_attempt_count', full_name='wireless.android.platform.testing.bluetooth.metrics.BluetoothReconnectTestResult.connection_attempt_count', index=1,
number=2, type=5, cpp_type=1, label=1,
has_default_value=False, default_value=0,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ options=None),
_descriptor.FieldDescriptor(
name='connection_successful_count', full_name='wireless.android.platform.testing.bluetooth.metrics.BluetoothReconnectTestResult.connection_successful_count', index=2,
number=3, type=5, cpp_type=1, label=1,
has_default_value=False, default_value=0,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ options=None),
_descriptor.FieldDescriptor(
name='connection_failed_count', full_name='wireless.android.platform.testing.bluetooth.metrics.BluetoothReconnectTestResult.connection_failed_count', index=3,
number=4, type=5, cpp_type=1, label=1,
has_default_value=False, default_value=0,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ options=None),
_descriptor.FieldDescriptor(
name='connection_max_time_millis', full_name='wireless.android.platform.testing.bluetooth.metrics.BluetoothReconnectTestResult.connection_max_time_millis', index=4,
number=5, type=5, cpp_type=1, label=1,
has_default_value=False, default_value=0,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ options=None),
_descriptor.FieldDescriptor(
name='connection_min_time_millis', full_name='wireless.android.platform.testing.bluetooth.metrics.BluetoothReconnectTestResult.connection_min_time_millis', index=5,
number=6, type=5, cpp_type=1, label=1,
has_default_value=False, default_value=0,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ options=None),
_descriptor.FieldDescriptor(
name='connection_avg_time_millis', full_name='wireless.android.platform.testing.bluetooth.metrics.BluetoothReconnectTestResult.connection_avg_time_millis', index=6,
number=7, type=5, cpp_type=1, label=1,
has_default_value=False, default_value=0,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ options=None),
_descriptor.FieldDescriptor(
name='acl_connection_max_time_millis', full_name='wireless.android.platform.testing.bluetooth.metrics.BluetoothReconnectTestResult.acl_connection_max_time_millis', index=7,
number=8, type=5, cpp_type=1, label=1,
has_default_value=False, default_value=0,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ options=None),
_descriptor.FieldDescriptor(
name='acl_connection_min_time_millis', full_name='wireless.android.platform.testing.bluetooth.metrics.BluetoothReconnectTestResult.acl_connection_min_time_millis', index=8,
number=9, type=5, cpp_type=1, label=1,
has_default_value=False, default_value=0,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ options=None),
_descriptor.FieldDescriptor(
name='acl_connection_avg_time_millis', full_name='wireless.android.platform.testing.bluetooth.metrics.BluetoothReconnectTestResult.acl_connection_avg_time_millis', index=9,
number=10, type=5, cpp_type=1, label=1,
has_default_value=False, default_value=0,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ options=None),
],
extensions=[
],
nested_types=[],
enum_types=[
],
- serialized_options=None,
+ options=None,
is_extendable=False,
syntax='proto2',
extension_ranges=[],
@@ -353,7 +337,6 @@
filename=None,
file=DESCRIPTOR,
containing_type=None,
- create_key=_descriptor._internal_create_key,
fields=[
_descriptor.FieldDescriptor(
name='configuration_data', full_name='wireless.android.platform.testing.bluetooth.metrics.BluetoothPairAndConnectTestResult.configuration_data', index=0,
@@ -361,77 +344,77 @@
has_default_value=False, default_value=None,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ options=None),
_descriptor.FieldDescriptor(
name='pair_attempt_count', full_name='wireless.android.platform.testing.bluetooth.metrics.BluetoothPairAndConnectTestResult.pair_attempt_count', index=1,
number=2, type=5, cpp_type=1, label=1,
has_default_value=False, default_value=0,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ options=None),
_descriptor.FieldDescriptor(
name='pair_successful_count', full_name='wireless.android.platform.testing.bluetooth.metrics.BluetoothPairAndConnectTestResult.pair_successful_count', index=2,
number=3, type=5, cpp_type=1, label=1,
has_default_value=False, default_value=0,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ options=None),
_descriptor.FieldDescriptor(
name='pair_failed_count', full_name='wireless.android.platform.testing.bluetooth.metrics.BluetoothPairAndConnectTestResult.pair_failed_count', index=3,
number=4, type=5, cpp_type=1, label=1,
has_default_value=False, default_value=0,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ options=None),
_descriptor.FieldDescriptor(
name='pair_max_time_millis', full_name='wireless.android.platform.testing.bluetooth.metrics.BluetoothPairAndConnectTestResult.pair_max_time_millis', index=4,
number=5, type=5, cpp_type=1, label=1,
has_default_value=False, default_value=0,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ options=None),
_descriptor.FieldDescriptor(
name='pair_min_time_millis', full_name='wireless.android.platform.testing.bluetooth.metrics.BluetoothPairAndConnectTestResult.pair_min_time_millis', index=5,
number=6, type=5, cpp_type=1, label=1,
has_default_value=False, default_value=0,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ options=None),
_descriptor.FieldDescriptor(
name='pair_avg_time_millis', full_name='wireless.android.platform.testing.bluetooth.metrics.BluetoothPairAndConnectTestResult.pair_avg_time_millis', index=6,
number=7, type=5, cpp_type=1, label=1,
has_default_value=False, default_value=0,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ options=None),
_descriptor.FieldDescriptor(
name='first_connection_max_time_millis', full_name='wireless.android.platform.testing.bluetooth.metrics.BluetoothPairAndConnectTestResult.first_connection_max_time_millis', index=7,
number=8, type=5, cpp_type=1, label=1,
has_default_value=False, default_value=0,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ options=None),
_descriptor.FieldDescriptor(
name='first_connection_min_time_millis', full_name='wireless.android.platform.testing.bluetooth.metrics.BluetoothPairAndConnectTestResult.first_connection_min_time_millis', index=8,
number=9, type=5, cpp_type=1, label=1,
has_default_value=False, default_value=0,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ options=None),
_descriptor.FieldDescriptor(
name='first_connection_avg_time_millis', full_name='wireless.android.platform.testing.bluetooth.metrics.BluetoothPairAndConnectTestResult.first_connection_avg_time_millis', index=9,
number=10, type=5, cpp_type=1, label=1,
has_default_value=False, default_value=0,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ options=None),
],
extensions=[
],
nested_types=[],
enum_types=[
],
- serialized_options=None,
+ options=None,
is_extendable=False,
syntax='proto2',
extension_ranges=[],
@@ -448,7 +431,6 @@
filename=None,
file=DESCRIPTOR,
containing_type=None,
- create_key=_descriptor._internal_create_key,
fields=[
_descriptor.FieldDescriptor(
name='codec_type', full_name='wireless.android.platform.testing.bluetooth.metrics.BluetoothA2dpCodecConfig.codec_type', index=0,
@@ -456,28 +438,28 @@
has_default_value=False, default_value=0,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ options=None),
_descriptor.FieldDescriptor(
name='sample_rate', full_name='wireless.android.platform.testing.bluetooth.metrics.BluetoothA2dpCodecConfig.sample_rate', index=1,
number=2, type=5, cpp_type=1, label=1,
has_default_value=False, default_value=0,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ options=None),
_descriptor.FieldDescriptor(
name='bits_per_sample', full_name='wireless.android.platform.testing.bluetooth.metrics.BluetoothA2dpCodecConfig.bits_per_sample', index=2,
number=3, type=5, cpp_type=1, label=1,
has_default_value=False, default_value=0,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ options=None),
_descriptor.FieldDescriptor(
name='channel_mode', full_name='wireless.android.platform.testing.bluetooth.metrics.BluetoothA2dpCodecConfig.channel_mode', index=3,
number=4, type=5, cpp_type=1, label=1,
has_default_value=False, default_value=0,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ options=None),
],
extensions=[
],
@@ -485,7 +467,7 @@
enum_types=[
_BLUETOOTHA2DPCODECCONFIG_BLUETOOTHA2DPCODEC,
],
- serialized_options=None,
+ options=None,
is_extendable=False,
syntax='proto2',
extension_ranges=[],
@@ -502,7 +484,6 @@
filename=None,
file=DESCRIPTOR,
containing_type=None,
- create_key=_descriptor._internal_create_key,
fields=[
_descriptor.FieldDescriptor(
name='timestamp_since_beginning_of_test_millis', full_name='wireless.android.platform.testing.bluetooth.metrics.AudioTestDataPoint.timestamp_since_beginning_of_test_millis', index=0,
@@ -510,42 +491,42 @@
has_default_value=False, default_value=0,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ options=None),
_descriptor.FieldDescriptor(
name='audio_streaming_duration_millis', full_name='wireless.android.platform.testing.bluetooth.metrics.AudioTestDataPoint.audio_streaming_duration_millis', index=1,
number=2, type=3, cpp_type=2, label=1,
has_default_value=False, default_value=0,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ options=None),
_descriptor.FieldDescriptor(
name='attenuation_db', full_name='wireless.android.platform.testing.bluetooth.metrics.AudioTestDataPoint.attenuation_db', index=2,
number=3, type=5, cpp_type=1, label=1,
has_default_value=False, default_value=0,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ options=None),
_descriptor.FieldDescriptor(
name='total_harmonic_distortion_plus_noise_percent', full_name='wireless.android.platform.testing.bluetooth.metrics.AudioTestDataPoint.total_harmonic_distortion_plus_noise_percent', index=3,
number=4, type=2, cpp_type=6, label=1,
has_default_value=False, default_value=float(0),
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ options=None),
_descriptor.FieldDescriptor(
name='audio_glitches_count', full_name='wireless.android.platform.testing.bluetooth.metrics.AudioTestDataPoint.audio_glitches_count', index=4,
number=5, type=5, cpp_type=1, label=1,
has_default_value=False, default_value=0,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ options=None),
],
extensions=[
],
nested_types=[],
enum_types=[
],
- serialized_options=None,
+ options=None,
is_extendable=False,
syntax='proto2',
extension_ranges=[],
@@ -562,7 +543,6 @@
filename=None,
file=DESCRIPTOR,
containing_type=None,
- create_key=_descriptor._internal_create_key,
fields=[
_descriptor.FieldDescriptor(
name='configuration_data', full_name='wireless.android.platform.testing.bluetooth.metrics.BluetoothAudioTestResult.configuration_data', index=0,
@@ -570,77 +550,77 @@
has_default_value=False, default_value=None,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ options=None),
_descriptor.FieldDescriptor(
name='audio_profile', full_name='wireless.android.platform.testing.bluetooth.metrics.BluetoothAudioTestResult.audio_profile', index=1,
number=2, type=14, cpp_type=8, label=1,
has_default_value=False, default_value=0,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ options=None),
_descriptor.FieldDescriptor(
name='audio_latency_min_millis', full_name='wireless.android.platform.testing.bluetooth.metrics.BluetoothAudioTestResult.audio_latency_min_millis', index=2,
number=3, type=5, cpp_type=1, label=1,
has_default_value=False, default_value=0,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ options=None),
_descriptor.FieldDescriptor(
name='audio_latency_max_millis', full_name='wireless.android.platform.testing.bluetooth.metrics.BluetoothAudioTestResult.audio_latency_max_millis', index=3,
number=4, type=5, cpp_type=1, label=1,
has_default_value=False, default_value=0,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ options=None),
_descriptor.FieldDescriptor(
name='audio_latency_avg_millis', full_name='wireless.android.platform.testing.bluetooth.metrics.BluetoothAudioTestResult.audio_latency_avg_millis', index=4,
number=5, type=5, cpp_type=1, label=1,
has_default_value=False, default_value=0,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ options=None),
_descriptor.FieldDescriptor(
name='audio_glitches_count', full_name='wireless.android.platform.testing.bluetooth.metrics.BluetoothAudioTestResult.audio_glitches_count', index=5,
number=6, type=5, cpp_type=1, label=1,
has_default_value=False, default_value=0,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ options=None),
_descriptor.FieldDescriptor(
name='audio_missed_packets_count', full_name='wireless.android.platform.testing.bluetooth.metrics.BluetoothAudioTestResult.audio_missed_packets_count', index=6,
number=7, type=5, cpp_type=1, label=1,
has_default_value=False, default_value=0,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ options=None),
_descriptor.FieldDescriptor(
name='total_harmonic_distortion_plus_noise', full_name='wireless.android.platform.testing.bluetooth.metrics.BluetoothAudioTestResult.total_harmonic_distortion_plus_noise', index=7,
number=8, type=2, cpp_type=6, label=1,
has_default_value=False, default_value=float(0),
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ options=None),
_descriptor.FieldDescriptor(
name='audio_streaming_duration_millis', full_name='wireless.android.platform.testing.bluetooth.metrics.BluetoothAudioTestResult.audio_streaming_duration_millis', index=8,
number=9, type=3, cpp_type=2, label=1,
has_default_value=False, default_value=0,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ options=None),
_descriptor.FieldDescriptor(
name='a2dp_codec_config', full_name='wireless.android.platform.testing.bluetooth.metrics.BluetoothAudioTestResult.a2dp_codec_config', index=9,
number=10, type=11, cpp_type=10, label=1,
has_default_value=False, default_value=None,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ options=None),
_descriptor.FieldDescriptor(
name='data_points', full_name='wireless.android.platform.testing.bluetooth.metrics.BluetoothAudioTestResult.data_points', index=10,
number=11, type=11, cpp_type=10, label=3,
has_default_value=False, default_value=[],
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ options=None),
],
extensions=[
],
@@ -648,7 +628,7 @@
enum_types=[
_BLUETOOTHAUDIOTESTRESULT_AUDIOPROFILE,
],
- serialized_options=None,
+ options=None,
is_extendable=False,
syntax='proto2',
extension_ranges=[],
@@ -665,7 +645,6 @@
filename=None,
file=DESCRIPTOR,
containing_type=None,
- create_key=_descriptor._internal_create_key,
fields=[
_descriptor.FieldDescriptor(
name='configuration_data', full_name='wireless.android.platform.testing.bluetooth.metrics.BluetoothDataTestResult.configuration_data', index=0,
@@ -673,63 +652,63 @@
has_default_value=False, default_value=None,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ options=None),
_descriptor.FieldDescriptor(
name='data_transfer_protocol', full_name='wireless.android.platform.testing.bluetooth.metrics.BluetoothDataTestResult.data_transfer_protocol', index=1,
number=2, type=14, cpp_type=8, label=1,
has_default_value=False, default_value=0,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ options=None),
_descriptor.FieldDescriptor(
name='data_latency_min_millis', full_name='wireless.android.platform.testing.bluetooth.metrics.BluetoothDataTestResult.data_latency_min_millis', index=2,
number=3, type=5, cpp_type=1, label=1,
has_default_value=False, default_value=0,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ options=None),
_descriptor.FieldDescriptor(
name='data_latency_max_millis', full_name='wireless.android.platform.testing.bluetooth.metrics.BluetoothDataTestResult.data_latency_max_millis', index=3,
number=4, type=5, cpp_type=1, label=1,
has_default_value=False, default_value=0,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ options=None),
_descriptor.FieldDescriptor(
name='data_latency_avg_millis', full_name='wireless.android.platform.testing.bluetooth.metrics.BluetoothDataTestResult.data_latency_avg_millis', index=4,
number=5, type=5, cpp_type=1, label=1,
has_default_value=False, default_value=0,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ options=None),
_descriptor.FieldDescriptor(
name='data_throughput_min_bytes_per_second', full_name='wireless.android.platform.testing.bluetooth.metrics.BluetoothDataTestResult.data_throughput_min_bytes_per_second', index=5,
number=6, type=5, cpp_type=1, label=1,
has_default_value=False, default_value=0,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ options=None),
_descriptor.FieldDescriptor(
name='data_throughput_max_bytes_per_second', full_name='wireless.android.platform.testing.bluetooth.metrics.BluetoothDataTestResult.data_throughput_max_bytes_per_second', index=6,
number=7, type=5, cpp_type=1, label=1,
has_default_value=False, default_value=0,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ options=None),
_descriptor.FieldDescriptor(
name='data_throughput_avg_bytes_per_second', full_name='wireless.android.platform.testing.bluetooth.metrics.BluetoothDataTestResult.data_throughput_avg_bytes_per_second', index=7,
number=8, type=5, cpp_type=1, label=1,
has_default_value=False, default_value=0,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ options=None),
_descriptor.FieldDescriptor(
name='data_packet_size', full_name='wireless.android.platform.testing.bluetooth.metrics.BluetoothDataTestResult.data_packet_size', index=8,
number=9, type=5, cpp_type=1, label=1,
has_default_value=False, default_value=0,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ options=None),
],
extensions=[
],
@@ -737,7 +716,7 @@
enum_types=[
_BLUETOOTHDATATESTRESULT_DATATRANSFERPROTOCOL,
],
- serialized_options=None,
+ options=None,
is_extendable=False,
syntax='proto2',
extension_ranges=[],
@@ -769,62 +748,61 @@
DESCRIPTOR.message_types_by_name['AudioTestDataPoint'] = _AUDIOTESTDATAPOINT
DESCRIPTOR.message_types_by_name['BluetoothAudioTestResult'] = _BLUETOOTHAUDIOTESTRESULT
DESCRIPTOR.message_types_by_name['BluetoothDataTestResult'] = _BLUETOOTHDATATESTRESULT
-_sym_db.RegisterFileDescriptor(DESCRIPTOR)
-BluetoothTestDevice = _reflection.GeneratedProtocolMessageType('BluetoothTestDevice', (_message.Message,), {
- 'DESCRIPTOR' : _BLUETOOTHTESTDEVICE,
- '__module__' : 'bluetooth_metric_pb2'
+BluetoothTestDevice = _reflection.GeneratedProtocolMessageType('BluetoothTestDevice', (_message.Message,), dict(
+ DESCRIPTOR = _BLUETOOTHTESTDEVICE,
+ __module__ = 'bluetooth_metric_pb2'
# @@protoc_insertion_point(class_scope:wireless.android.platform.testing.bluetooth.metrics.BluetoothTestDevice)
- })
+ ))
_sym_db.RegisterMessage(BluetoothTestDevice)
-BluetoothContinuousTestResultHeader = _reflection.GeneratedProtocolMessageType('BluetoothContinuousTestResultHeader', (_message.Message,), {
- 'DESCRIPTOR' : _BLUETOOTHCONTINUOUSTESTRESULTHEADER,
- '__module__' : 'bluetooth_metric_pb2'
+BluetoothContinuousTestResultHeader = _reflection.GeneratedProtocolMessageType('BluetoothContinuousTestResultHeader', (_message.Message,), dict(
+ DESCRIPTOR = _BLUETOOTHCONTINUOUSTESTRESULTHEADER,
+ __module__ = 'bluetooth_metric_pb2'
# @@protoc_insertion_point(class_scope:wireless.android.platform.testing.bluetooth.metrics.BluetoothContinuousTestResultHeader)
- })
+ ))
_sym_db.RegisterMessage(BluetoothContinuousTestResultHeader)
-BluetoothReconnectTestResult = _reflection.GeneratedProtocolMessageType('BluetoothReconnectTestResult', (_message.Message,), {
- 'DESCRIPTOR' : _BLUETOOTHRECONNECTTESTRESULT,
- '__module__' : 'bluetooth_metric_pb2'
+BluetoothReconnectTestResult = _reflection.GeneratedProtocolMessageType('BluetoothReconnectTestResult', (_message.Message,), dict(
+ DESCRIPTOR = _BLUETOOTHRECONNECTTESTRESULT,
+ __module__ = 'bluetooth_metric_pb2'
# @@protoc_insertion_point(class_scope:wireless.android.platform.testing.bluetooth.metrics.BluetoothReconnectTestResult)
- })
+ ))
_sym_db.RegisterMessage(BluetoothReconnectTestResult)
-BluetoothPairAndConnectTestResult = _reflection.GeneratedProtocolMessageType('BluetoothPairAndConnectTestResult', (_message.Message,), {
- 'DESCRIPTOR' : _BLUETOOTHPAIRANDCONNECTTESTRESULT,
- '__module__' : 'bluetooth_metric_pb2'
+BluetoothPairAndConnectTestResult = _reflection.GeneratedProtocolMessageType('BluetoothPairAndConnectTestResult', (_message.Message,), dict(
+ DESCRIPTOR = _BLUETOOTHPAIRANDCONNECTTESTRESULT,
+ __module__ = 'bluetooth_metric_pb2'
# @@protoc_insertion_point(class_scope:wireless.android.platform.testing.bluetooth.metrics.BluetoothPairAndConnectTestResult)
- })
+ ))
_sym_db.RegisterMessage(BluetoothPairAndConnectTestResult)
-BluetoothA2dpCodecConfig = _reflection.GeneratedProtocolMessageType('BluetoothA2dpCodecConfig', (_message.Message,), {
- 'DESCRIPTOR' : _BLUETOOTHA2DPCODECCONFIG,
- '__module__' : 'bluetooth_metric_pb2'
+BluetoothA2dpCodecConfig = _reflection.GeneratedProtocolMessageType('BluetoothA2dpCodecConfig', (_message.Message,), dict(
+ DESCRIPTOR = _BLUETOOTHA2DPCODECCONFIG,
+ __module__ = 'bluetooth_metric_pb2'
# @@protoc_insertion_point(class_scope:wireless.android.platform.testing.bluetooth.metrics.BluetoothA2dpCodecConfig)
- })
+ ))
_sym_db.RegisterMessage(BluetoothA2dpCodecConfig)
-AudioTestDataPoint = _reflection.GeneratedProtocolMessageType('AudioTestDataPoint', (_message.Message,), {
- 'DESCRIPTOR' : _AUDIOTESTDATAPOINT,
- '__module__' : 'bluetooth_metric_pb2'
+AudioTestDataPoint = _reflection.GeneratedProtocolMessageType('AudioTestDataPoint', (_message.Message,), dict(
+ DESCRIPTOR = _AUDIOTESTDATAPOINT,
+ __module__ = 'bluetooth_metric_pb2'
# @@protoc_insertion_point(class_scope:wireless.android.platform.testing.bluetooth.metrics.AudioTestDataPoint)
- })
+ ))
_sym_db.RegisterMessage(AudioTestDataPoint)
-BluetoothAudioTestResult = _reflection.GeneratedProtocolMessageType('BluetoothAudioTestResult', (_message.Message,), {
- 'DESCRIPTOR' : _BLUETOOTHAUDIOTESTRESULT,
- '__module__' : 'bluetooth_metric_pb2'
+BluetoothAudioTestResult = _reflection.GeneratedProtocolMessageType('BluetoothAudioTestResult', (_message.Message,), dict(
+ DESCRIPTOR = _BLUETOOTHAUDIOTESTRESULT,
+ __module__ = 'bluetooth_metric_pb2'
# @@protoc_insertion_point(class_scope:wireless.android.platform.testing.bluetooth.metrics.BluetoothAudioTestResult)
- })
+ ))
_sym_db.RegisterMessage(BluetoothAudioTestResult)
-BluetoothDataTestResult = _reflection.GeneratedProtocolMessageType('BluetoothDataTestResult', (_message.Message,), {
- 'DESCRIPTOR' : _BLUETOOTHDATATESTRESULT,
- '__module__' : 'bluetooth_metric_pb2'
+BluetoothDataTestResult = _reflection.GeneratedProtocolMessageType('BluetoothDataTestResult', (_message.Message,), dict(
+ DESCRIPTOR = _BLUETOOTHDATATESTRESULT,
+ __module__ = 'bluetooth_metric_pb2'
# @@protoc_insertion_point(class_scope:wireless.android.platform.testing.bluetooth.metrics.BluetoothDataTestResult)
- })
+ ))
_sym_db.RegisterMessage(BluetoothDataTestResult)
diff --git a/acts_tests/acts_contrib/test_utils/bt/native_bt_test_utils.py b/acts/framework/acts/test_utils/bt/native_bt_test_utils.py
similarity index 100%
rename from acts_tests/acts_contrib/test_utils/bt/native_bt_test_utils.py
rename to acts/framework/acts/test_utils/bt/native_bt_test_utils.py
diff --git a/acts_tests/acts_contrib/test_utils/bt/protos/__init__.py b/acts/framework/acts/test_utils/bt/protos/__init__.py
similarity index 100%
rename from acts_tests/acts_contrib/test_utils/bt/protos/__init__.py
rename to acts/framework/acts/test_utils/bt/protos/__init__.py
diff --git a/acts_tests/acts_contrib/test_utils/bt/protos/bluetooth.proto b/acts/framework/acts/test_utils/bt/protos/bluetooth.proto
similarity index 100%
rename from acts_tests/acts_contrib/test_utils/bt/protos/bluetooth.proto
rename to acts/framework/acts/test_utils/bt/protos/bluetooth.proto
diff --git a/acts_tests/acts_contrib/test_utils/bt/protos/bluetooth_pb2.py b/acts/framework/acts/test_utils/bt/protos/bluetooth_pb2.py
similarity index 83%
rename from acts_tests/acts_contrib/test_utils/bt/protos/bluetooth_pb2.py
rename to acts/framework/acts/test_utils/bt/protos/bluetooth_pb2.py
index bce90e4..b1e840d 100644
--- a/acts_tests/acts_contrib/test_utils/bt/protos/bluetooth_pb2.py
+++ b/acts/framework/acts/test_utils/bt/protos/bluetooth_pb2.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
# Generated by the protocol buffer compiler. DO NOT EDIT!
# source: bluetooth.proto
-"""Generated protocol buffer code."""
+
from google.protobuf.internal import enum_type_wrapper
from google.protobuf import descriptor as _descriptor
from google.protobuf import message as _message
@@ -19,7 +19,6 @@
package='bluetooth.metrics.BluetoothMetricsProto',
syntax='proto2',
serialized_options=b'\n\025com.android.bluetoothB\025BluetoothMetricsProtoH\003',
- create_key=_descriptor._internal_create_key,
serialized_pb=b'\n\x0f\x62luetooth.proto\x12\'bluetooth.metrics.BluetoothMetricsProto\"\x8a\x05\n\x0c\x42luetoothLog\x12J\n\x07session\x18\x01 \x03(\x0b\x32\x39.bluetooth.metrics.BluetoothMetricsProto.BluetoothSession\x12\x46\n\npair_event\x18\x02 \x03(\x0b\x32\x32.bluetooth.metrics.BluetoothMetricsProto.PairEvent\x12\x46\n\nwake_event\x18\x03 \x03(\x0b\x32\x32.bluetooth.metrics.BluetoothMetricsProto.WakeEvent\x12\x46\n\nscan_event\x18\x04 \x03(\x0b\x32\x32.bluetooth.metrics.BluetoothMetricsProto.ScanEvent\x12\x1a\n\x12num_bonded_devices\x18\x05 \x01(\x05\x12\x1d\n\x15num_bluetooth_session\x18\x06 \x01(\x03\x12\x16\n\x0enum_pair_event\x18\x07 \x01(\x03\x12\x16\n\x0enum_wake_event\x18\x08 \x01(\x03\x12\x16\n\x0enum_scan_event\x18\t \x01(\x03\x12\x61\n\x18profile_connection_stats\x18\n \x03(\x0b\x32?.bluetooth.metrics.BluetoothMetricsProto.ProfileConnectionStats\x12p\n headset_profile_connection_stats\x18\x0b \x03(\x0b\x32\x46.bluetooth.metrics.BluetoothMetricsProto.HeadsetProfileConnectionStats\"\xdf\x01\n\nDeviceInfo\x12\x14\n\x0c\x64\x65vice_class\x18\x01 \x01(\x05\x12S\n\x0b\x64\x65vice_type\x18\x02 \x01(\x0e\x32>.bluetooth.metrics.BluetoothMetricsProto.DeviceInfo.DeviceType\"f\n\nDeviceType\x12\x17\n\x13\x44\x45VICE_TYPE_UNKNOWN\x10\x00\x12\x15\n\x11\x44\x45VICE_TYPE_BREDR\x10\x01\x12\x12\n\x0e\x44\x45VICE_TYPE_LE\x10\x02\x12\x14\n\x10\x44\x45VICE_TYPE_DUMO\x10\x03\"\x8f\x06\n\x10\x42luetoothSession\x12\x1c\n\x14session_duration_sec\x18\x02 \x01(\x03\x12v\n\x1a\x63onnection_technology_type\x18\x03 \x01(\x0e\x32R.bluetooth.metrics.BluetoothMetricsProto.BluetoothSession.ConnectionTechnologyType\x12\x1d\n\x11\x64isconnect_reason\x18\x04 \x01(\tB\x02\x18\x01\x12P\n\x13\x64\x65vice_connected_to\x18\x05 \x01(\x0b\x32\x33.bluetooth.metrics.BluetoothMetricsProto.DeviceInfo\x12N\n\x0erfcomm_session\x18\x06 \x01(\x0b\x32\x36.bluetooth.metrics.BluetoothMetricsProto.RFCommSession\x12J\n\x0c\x61\x32\x64p_session\x18\x07 \x01(\x0b\x32\x34.bluetooth.metrics.BluetoothMetricsProto.A2DPSession\x12n\n\x16\x64isconnect_reason_type\x18\x08 \x01(\x0e\x32N.bluetooth.metrics.BluetoothMetricsProto.BluetoothSession.DisconnectReasonType\"\x8b\x01\n\x18\x43onnectionTechnologyType\x12&\n\"CONNECTION_TECHNOLOGY_TYPE_UNKNOWN\x10\x00\x12!\n\x1d\x43ONNECTION_TECHNOLOGY_TYPE_LE\x10\x01\x12$\n CONNECTION_TECHNOLOGY_TYPE_BREDR\x10\x02\"Z\n\x14\x44isconnectReasonType\x12\x0b\n\x07UNKNOWN\x10\x00\x12\x10\n\x0cMETRICS_DUMP\x10\x01\x12#\n\x1fNEXT_START_WITHOUT_END_PREVIOUS\x10\x02\"3\n\rRFCommSession\x12\x10\n\x08rx_bytes\x18\x01 \x01(\x05\x12\x10\n\x08tx_bytes\x18\x02 \x01(\x05\"\xf9\x02\n\x0b\x41\x32\x44PSession\x12\x1e\n\x16media_timer_min_millis\x18\x01 \x01(\x05\x12\x1e\n\x16media_timer_max_millis\x18\x02 \x01(\x05\x12\x1e\n\x16media_timer_avg_millis\x18\x03 \x01(\x05\x12!\n\x19\x62uffer_overruns_max_count\x18\x04 \x01(\x05\x12\x1d\n\x15\x62uffer_overruns_total\x18\x05 \x01(\x05\x12 \n\x18\x62uffer_underruns_average\x18\x06 \x01(\x02\x12\x1e\n\x16\x62uffer_underruns_count\x18\x07 \x01(\x05\x12\x1d\n\x15\x61udio_duration_millis\x18\x08 \x01(\x03\x12N\n\x0csource_codec\x18\t \x01(\x0e\x32\x38.bluetooth.metrics.BluetoothMetricsProto.A2dpSourceCodec\x12\x17\n\x0fis_a2dp_offload\x18\n \x01(\x08\"\x92\x01\n\tPairEvent\x12\x19\n\x11\x64isconnect_reason\x18\x01 \x01(\x05\x12\x19\n\x11\x65vent_time_millis\x18\x02 \x01(\x03\x12O\n\x12\x64\x65vice_paired_with\x18\x03 \x01(\x0b\x32\x33.bluetooth.metrics.BluetoothMetricsProto.DeviceInfo\"\xdc\x01\n\tWakeEvent\x12Y\n\x0fwake_event_type\x18\x01 \x01(\x0e\x32@.bluetooth.metrics.BluetoothMetricsProto.WakeEvent.WakeEventType\x12\x11\n\trequestor\x18\x02 \x01(\t\x12\x0c\n\x04name\x18\x03 \x01(\t\x12\x19\n\x11\x65vent_time_millis\x18\x04 \x01(\x03\"8\n\rWakeEventType\x12\x0b\n\x07UNKNOWN\x10\x00\x12\x0c\n\x08\x41\x43QUIRED\x10\x01\x12\x0c\n\x08RELEASED\x10\x02\"\xc4\x03\n\tScanEvent\x12Y\n\x0fscan_event_type\x18\x01 \x01(\x0e\x32@.bluetooth.metrics.BluetoothMetricsProto.ScanEvent.ScanEventType\x12\x11\n\tinitiator\x18\x02 \x01(\t\x12\x63\n\x14scan_technology_type\x18\x03 \x01(\x0e\x32\x45.bluetooth.metrics.BluetoothMetricsProto.ScanEvent.ScanTechnologyType\x12\x16\n\x0enumber_results\x18\x04 \x01(\x05\x12\x19\n\x11\x65vent_time_millis\x18\x05 \x01(\x03\"u\n\x12ScanTechnologyType\x12\x15\n\x11SCAN_TYPE_UNKNOWN\x10\x00\x12\x15\n\x11SCAN_TECH_TYPE_LE\x10\x01\x12\x18\n\x14SCAN_TECH_TYPE_BREDR\x10\x02\x12\x17\n\x13SCAN_TECH_TYPE_BOTH\x10\x03\":\n\rScanEventType\x12\x14\n\x10SCAN_EVENT_START\x10\x00\x12\x13\n\x0fSCAN_EVENT_STOP\x10\x01\"}\n\x16ProfileConnectionStats\x12\x46\n\nprofile_id\x18\x01 \x01(\x0e\x32\x32.bluetooth.metrics.BluetoothMetricsProto.ProfileId\x12\x1b\n\x13num_times_connected\x18\x02 \x01(\x05\"\x97\x01\n\x1dHeadsetProfileConnectionStats\x12Y\n\x14headset_profile_type\x18\x01 \x01(\x0e\x32;.bluetooth.metrics.BluetoothMetricsProto.HeadsetProfileType\x12\x1b\n\x13num_times_connected\x18\x02 \x01(\x05*\xbd\x01\n\x0f\x41\x32\x64pSourceCodec\x12\x1d\n\x19\x41\x32\x44P_SOURCE_CODEC_UNKNOWN\x10\x00\x12\x19\n\x15\x41\x32\x44P_SOURCE_CODEC_SBC\x10\x01\x12\x19\n\x15\x41\x32\x44P_SOURCE_CODEC_AAC\x10\x02\x12\x1a\n\x16\x41\x32\x44P_SOURCE_CODEC_APTX\x10\x03\x12\x1d\n\x19\x41\x32\x44P_SOURCE_CODEC_APTX_HD\x10\x04\x12\x1a\n\x16\x41\x32\x44P_SOURCE_CODEC_LDAC\x10\x05*\xa0\x02\n\tProfileId\x12\x13\n\x0fPROFILE_UNKNOWN\x10\x00\x12\x0b\n\x07HEADSET\x10\x01\x12\x08\n\x04\x41\x32\x44P\x10\x02\x12\n\n\x06HEALTH\x10\x03\x12\x0c\n\x08HID_HOST\x10\x04\x12\x07\n\x03PAN\x10\x05\x12\x08\n\x04PBAP\x10\x06\x12\x08\n\x04GATT\x10\x07\x12\x0f\n\x0bGATT_SERVER\x10\x08\x12\x07\n\x03MAP\x10\t\x12\x07\n\x03SAP\x10\n\x12\r\n\tA2DP_SINK\x10\x0b\x12\x14\n\x10\x41VRCP_CONTROLLER\x10\x0c\x12\t\n\x05\x41VRCP\x10\r\x12\x12\n\x0eHEADSET_CLIENT\x10\x10\x12\x0f\n\x0bPBAP_CLIENT\x10\x11\x12\x0e\n\nMAP_CLIENT\x10\x12\x12\x0e\n\nHID_DEVICE\x10\x13\x12\x07\n\x03OPP\x10\x14\x12\x0f\n\x0bHEARING_AID\x10\x15*C\n\x12HeadsetProfileType\x12\x1b\n\x17HEADSET_PROFILE_UNKNOWN\x10\x00\x12\x07\n\x03HSP\x10\x01\x12\x07\n\x03HFP\x10\x02\x42\x30\n\x15\x63om.android.bluetoothB\x15\x42luetoothMetricsProtoH\x03'
)
@@ -28,38 +27,31 @@
full_name='bluetooth.metrics.BluetoothMetricsProto.A2dpSourceCodec',
filename=None,
file=DESCRIPTOR,
- create_key=_descriptor._internal_create_key,
values=[
_descriptor.EnumValueDescriptor(
name='A2DP_SOURCE_CODEC_UNKNOWN', index=0, number=0,
serialized_options=None,
- type=None,
- create_key=_descriptor._internal_create_key),
+ type=None),
_descriptor.EnumValueDescriptor(
name='A2DP_SOURCE_CODEC_SBC', index=1, number=1,
serialized_options=None,
- type=None,
- create_key=_descriptor._internal_create_key),
+ type=None),
_descriptor.EnumValueDescriptor(
name='A2DP_SOURCE_CODEC_AAC', index=2, number=2,
serialized_options=None,
- type=None,
- create_key=_descriptor._internal_create_key),
+ type=None),
_descriptor.EnumValueDescriptor(
name='A2DP_SOURCE_CODEC_APTX', index=3, number=3,
serialized_options=None,
- type=None,
- create_key=_descriptor._internal_create_key),
+ type=None),
_descriptor.EnumValueDescriptor(
name='A2DP_SOURCE_CODEC_APTX_HD', index=4, number=4,
serialized_options=None,
- type=None,
- create_key=_descriptor._internal_create_key),
+ type=None),
_descriptor.EnumValueDescriptor(
name='A2DP_SOURCE_CODEC_LDAC', index=5, number=5,
serialized_options=None,
- type=None,
- create_key=_descriptor._internal_create_key),
+ type=None),
],
containing_type=None,
serialized_options=None,
@@ -74,108 +66,87 @@
full_name='bluetooth.metrics.BluetoothMetricsProto.ProfileId',
filename=None,
file=DESCRIPTOR,
- create_key=_descriptor._internal_create_key,
values=[
_descriptor.EnumValueDescriptor(
name='PROFILE_UNKNOWN', index=0, number=0,
serialized_options=None,
- type=None,
- create_key=_descriptor._internal_create_key),
+ type=None),
_descriptor.EnumValueDescriptor(
name='HEADSET', index=1, number=1,
serialized_options=None,
- type=None,
- create_key=_descriptor._internal_create_key),
+ type=None),
_descriptor.EnumValueDescriptor(
name='A2DP', index=2, number=2,
serialized_options=None,
- type=None,
- create_key=_descriptor._internal_create_key),
+ type=None),
_descriptor.EnumValueDescriptor(
name='HEALTH', index=3, number=3,
serialized_options=None,
- type=None,
- create_key=_descriptor._internal_create_key),
+ type=None),
_descriptor.EnumValueDescriptor(
name='HID_HOST', index=4, number=4,
serialized_options=None,
- type=None,
- create_key=_descriptor._internal_create_key),
+ type=None),
_descriptor.EnumValueDescriptor(
name='PAN', index=5, number=5,
serialized_options=None,
- type=None,
- create_key=_descriptor._internal_create_key),
+ type=None),
_descriptor.EnumValueDescriptor(
name='PBAP', index=6, number=6,
serialized_options=None,
- type=None,
- create_key=_descriptor._internal_create_key),
+ type=None),
_descriptor.EnumValueDescriptor(
name='GATT', index=7, number=7,
serialized_options=None,
- type=None,
- create_key=_descriptor._internal_create_key),
+ type=None),
_descriptor.EnumValueDescriptor(
name='GATT_SERVER', index=8, number=8,
serialized_options=None,
- type=None,
- create_key=_descriptor._internal_create_key),
+ type=None),
_descriptor.EnumValueDescriptor(
name='MAP', index=9, number=9,
serialized_options=None,
- type=None,
- create_key=_descriptor._internal_create_key),
+ type=None),
_descriptor.EnumValueDescriptor(
name='SAP', index=10, number=10,
serialized_options=None,
- type=None,
- create_key=_descriptor._internal_create_key),
+ type=None),
_descriptor.EnumValueDescriptor(
name='A2DP_SINK', index=11, number=11,
serialized_options=None,
- type=None,
- create_key=_descriptor._internal_create_key),
+ type=None),
_descriptor.EnumValueDescriptor(
name='AVRCP_CONTROLLER', index=12, number=12,
serialized_options=None,
- type=None,
- create_key=_descriptor._internal_create_key),
+ type=None),
_descriptor.EnumValueDescriptor(
name='AVRCP', index=13, number=13,
serialized_options=None,
- type=None,
- create_key=_descriptor._internal_create_key),
+ type=None),
_descriptor.EnumValueDescriptor(
name='HEADSET_CLIENT', index=14, number=16,
serialized_options=None,
- type=None,
- create_key=_descriptor._internal_create_key),
+ type=None),
_descriptor.EnumValueDescriptor(
name='PBAP_CLIENT', index=15, number=17,
serialized_options=None,
- type=None,
- create_key=_descriptor._internal_create_key),
+ type=None),
_descriptor.EnumValueDescriptor(
name='MAP_CLIENT', index=16, number=18,
serialized_options=None,
- type=None,
- create_key=_descriptor._internal_create_key),
+ type=None),
_descriptor.EnumValueDescriptor(
name='HID_DEVICE', index=17, number=19,
serialized_options=None,
- type=None,
- create_key=_descriptor._internal_create_key),
+ type=None),
_descriptor.EnumValueDescriptor(
name='OPP', index=18, number=20,
serialized_options=None,
- type=None,
- create_key=_descriptor._internal_create_key),
+ type=None),
_descriptor.EnumValueDescriptor(
name='HEARING_AID', index=19, number=21,
serialized_options=None,
- type=None,
- create_key=_descriptor._internal_create_key),
+ type=None),
],
containing_type=None,
serialized_options=None,
@@ -190,23 +161,19 @@
full_name='bluetooth.metrics.BluetoothMetricsProto.HeadsetProfileType',
filename=None,
file=DESCRIPTOR,
- create_key=_descriptor._internal_create_key,
values=[
_descriptor.EnumValueDescriptor(
name='HEADSET_PROFILE_UNKNOWN', index=0, number=0,
serialized_options=None,
- type=None,
- create_key=_descriptor._internal_create_key),
+ type=None),
_descriptor.EnumValueDescriptor(
name='HSP', index=1, number=1,
serialized_options=None,
- type=None,
- create_key=_descriptor._internal_create_key),
+ type=None),
_descriptor.EnumValueDescriptor(
name='HFP', index=2, number=2,
serialized_options=None,
- type=None,
- create_key=_descriptor._internal_create_key),
+ type=None),
],
containing_type=None,
serialized_options=None,
@@ -252,28 +219,23 @@
full_name='bluetooth.metrics.BluetoothMetricsProto.DeviceInfo.DeviceType',
filename=None,
file=DESCRIPTOR,
- create_key=_descriptor._internal_create_key,
values=[
_descriptor.EnumValueDescriptor(
name='DEVICE_TYPE_UNKNOWN', index=0, number=0,
serialized_options=None,
- type=None,
- create_key=_descriptor._internal_create_key),
+ type=None),
_descriptor.EnumValueDescriptor(
name='DEVICE_TYPE_BREDR', index=1, number=1,
serialized_options=None,
- type=None,
- create_key=_descriptor._internal_create_key),
+ type=None),
_descriptor.EnumValueDescriptor(
name='DEVICE_TYPE_LE', index=2, number=2,
serialized_options=None,
- type=None,
- create_key=_descriptor._internal_create_key),
+ type=None),
_descriptor.EnumValueDescriptor(
name='DEVICE_TYPE_DUMO', index=3, number=3,
serialized_options=None,
- type=None,
- create_key=_descriptor._internal_create_key),
+ type=None),
],
containing_type=None,
serialized_options=None,
@@ -287,23 +249,19 @@
full_name='bluetooth.metrics.BluetoothMetricsProto.BluetoothSession.ConnectionTechnologyType',
filename=None,
file=DESCRIPTOR,
- create_key=_descriptor._internal_create_key,
values=[
_descriptor.EnumValueDescriptor(
name='CONNECTION_TECHNOLOGY_TYPE_UNKNOWN', index=0, number=0,
serialized_options=None,
- type=None,
- create_key=_descriptor._internal_create_key),
+ type=None),
_descriptor.EnumValueDescriptor(
name='CONNECTION_TECHNOLOGY_TYPE_LE', index=1, number=1,
serialized_options=None,
- type=None,
- create_key=_descriptor._internal_create_key),
+ type=None),
_descriptor.EnumValueDescriptor(
name='CONNECTION_TECHNOLOGY_TYPE_BREDR', index=2, number=2,
serialized_options=None,
- type=None,
- create_key=_descriptor._internal_create_key),
+ type=None),
],
containing_type=None,
serialized_options=None,
@@ -317,23 +275,19 @@
full_name='bluetooth.metrics.BluetoothMetricsProto.BluetoothSession.DisconnectReasonType',
filename=None,
file=DESCRIPTOR,
- create_key=_descriptor._internal_create_key,
values=[
_descriptor.EnumValueDescriptor(
name='UNKNOWN', index=0, number=0,
serialized_options=None,
- type=None,
- create_key=_descriptor._internal_create_key),
+ type=None),
_descriptor.EnumValueDescriptor(
name='METRICS_DUMP', index=1, number=1,
serialized_options=None,
- type=None,
- create_key=_descriptor._internal_create_key),
+ type=None),
_descriptor.EnumValueDescriptor(
name='NEXT_START_WITHOUT_END_PREVIOUS', index=2, number=2,
serialized_options=None,
- type=None,
- create_key=_descriptor._internal_create_key),
+ type=None),
],
containing_type=None,
serialized_options=None,
@@ -347,23 +301,19 @@
full_name='bluetooth.metrics.BluetoothMetricsProto.WakeEvent.WakeEventType',
filename=None,
file=DESCRIPTOR,
- create_key=_descriptor._internal_create_key,
values=[
_descriptor.EnumValueDescriptor(
name='UNKNOWN', index=0, number=0,
serialized_options=None,
- type=None,
- create_key=_descriptor._internal_create_key),
+ type=None),
_descriptor.EnumValueDescriptor(
name='ACQUIRED', index=1, number=1,
serialized_options=None,
- type=None,
- create_key=_descriptor._internal_create_key),
+ type=None),
_descriptor.EnumValueDescriptor(
name='RELEASED', index=2, number=2,
serialized_options=None,
- type=None,
- create_key=_descriptor._internal_create_key),
+ type=None),
],
containing_type=None,
serialized_options=None,
@@ -377,28 +327,23 @@
full_name='bluetooth.metrics.BluetoothMetricsProto.ScanEvent.ScanTechnologyType',
filename=None,
file=DESCRIPTOR,
- create_key=_descriptor._internal_create_key,
values=[
_descriptor.EnumValueDescriptor(
name='SCAN_TYPE_UNKNOWN', index=0, number=0,
serialized_options=None,
- type=None,
- create_key=_descriptor._internal_create_key),
+ type=None),
_descriptor.EnumValueDescriptor(
name='SCAN_TECH_TYPE_LE', index=1, number=1,
serialized_options=None,
- type=None,
- create_key=_descriptor._internal_create_key),
+ type=None),
_descriptor.EnumValueDescriptor(
name='SCAN_TECH_TYPE_BREDR', index=2, number=2,
serialized_options=None,
- type=None,
- create_key=_descriptor._internal_create_key),
+ type=None),
_descriptor.EnumValueDescriptor(
name='SCAN_TECH_TYPE_BOTH', index=3, number=3,
serialized_options=None,
- type=None,
- create_key=_descriptor._internal_create_key),
+ type=None),
],
containing_type=None,
serialized_options=None,
@@ -412,18 +357,15 @@
full_name='bluetooth.metrics.BluetoothMetricsProto.ScanEvent.ScanEventType',
filename=None,
file=DESCRIPTOR,
- create_key=_descriptor._internal_create_key,
values=[
_descriptor.EnumValueDescriptor(
name='SCAN_EVENT_START', index=0, number=0,
serialized_options=None,
- type=None,
- create_key=_descriptor._internal_create_key),
+ type=None),
_descriptor.EnumValueDescriptor(
name='SCAN_EVENT_STOP', index=1, number=1,
serialized_options=None,
- type=None,
- create_key=_descriptor._internal_create_key),
+ type=None),
],
containing_type=None,
serialized_options=None,
@@ -439,7 +381,6 @@
filename=None,
file=DESCRIPTOR,
containing_type=None,
- create_key=_descriptor._internal_create_key,
fields=[
_descriptor.FieldDescriptor(
name='session', full_name='bluetooth.metrics.BluetoothMetricsProto.BluetoothLog.session', index=0,
@@ -447,77 +388,77 @@
has_default_value=False, default_value=[],
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ serialized_options=None, file=DESCRIPTOR),
_descriptor.FieldDescriptor(
name='pair_event', full_name='bluetooth.metrics.BluetoothMetricsProto.BluetoothLog.pair_event', index=1,
number=2, type=11, cpp_type=10, label=3,
has_default_value=False, default_value=[],
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ serialized_options=None, file=DESCRIPTOR),
_descriptor.FieldDescriptor(
name='wake_event', full_name='bluetooth.metrics.BluetoothMetricsProto.BluetoothLog.wake_event', index=2,
number=3, type=11, cpp_type=10, label=3,
has_default_value=False, default_value=[],
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ serialized_options=None, file=DESCRIPTOR),
_descriptor.FieldDescriptor(
name='scan_event', full_name='bluetooth.metrics.BluetoothMetricsProto.BluetoothLog.scan_event', index=3,
number=4, type=11, cpp_type=10, label=3,
has_default_value=False, default_value=[],
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ serialized_options=None, file=DESCRIPTOR),
_descriptor.FieldDescriptor(
name='num_bonded_devices', full_name='bluetooth.metrics.BluetoothMetricsProto.BluetoothLog.num_bonded_devices', index=4,
number=5, type=5, cpp_type=1, label=1,
has_default_value=False, default_value=0,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ serialized_options=None, file=DESCRIPTOR),
_descriptor.FieldDescriptor(
name='num_bluetooth_session', full_name='bluetooth.metrics.BluetoothMetricsProto.BluetoothLog.num_bluetooth_session', index=5,
number=6, type=3, cpp_type=2, label=1,
has_default_value=False, default_value=0,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ serialized_options=None, file=DESCRIPTOR),
_descriptor.FieldDescriptor(
name='num_pair_event', full_name='bluetooth.metrics.BluetoothMetricsProto.BluetoothLog.num_pair_event', index=6,
number=7, type=3, cpp_type=2, label=1,
has_default_value=False, default_value=0,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ serialized_options=None, file=DESCRIPTOR),
_descriptor.FieldDescriptor(
name='num_wake_event', full_name='bluetooth.metrics.BluetoothMetricsProto.BluetoothLog.num_wake_event', index=7,
number=8, type=3, cpp_type=2, label=1,
has_default_value=False, default_value=0,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ serialized_options=None, file=DESCRIPTOR),
_descriptor.FieldDescriptor(
name='num_scan_event', full_name='bluetooth.metrics.BluetoothMetricsProto.BluetoothLog.num_scan_event', index=8,
number=9, type=3, cpp_type=2, label=1,
has_default_value=False, default_value=0,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ serialized_options=None, file=DESCRIPTOR),
_descriptor.FieldDescriptor(
name='profile_connection_stats', full_name='bluetooth.metrics.BluetoothMetricsProto.BluetoothLog.profile_connection_stats', index=9,
number=10, type=11, cpp_type=10, label=3,
has_default_value=False, default_value=[],
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ serialized_options=None, file=DESCRIPTOR),
_descriptor.FieldDescriptor(
name='headset_profile_connection_stats', full_name='bluetooth.metrics.BluetoothMetricsProto.BluetoothLog.headset_profile_connection_stats', index=10,
number=11, type=11, cpp_type=10, label=3,
has_default_value=False, default_value=[],
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ serialized_options=None, file=DESCRIPTOR),
],
extensions=[
],
@@ -541,7 +482,6 @@
filename=None,
file=DESCRIPTOR,
containing_type=None,
- create_key=_descriptor._internal_create_key,
fields=[
_descriptor.FieldDescriptor(
name='device_class', full_name='bluetooth.metrics.BluetoothMetricsProto.DeviceInfo.device_class', index=0,
@@ -549,14 +489,14 @@
has_default_value=False, default_value=0,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ serialized_options=None, file=DESCRIPTOR),
_descriptor.FieldDescriptor(
name='device_type', full_name='bluetooth.metrics.BluetoothMetricsProto.DeviceInfo.device_type', index=1,
number=2, type=14, cpp_type=8, label=1,
has_default_value=False, default_value=0,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ serialized_options=None, file=DESCRIPTOR),
],
extensions=[
],
@@ -581,7 +521,6 @@
filename=None,
file=DESCRIPTOR,
containing_type=None,
- create_key=_descriptor._internal_create_key,
fields=[
_descriptor.FieldDescriptor(
name='session_duration_sec', full_name='bluetooth.metrics.BluetoothMetricsProto.BluetoothSession.session_duration_sec', index=0,
@@ -589,49 +528,49 @@
has_default_value=False, default_value=0,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ serialized_options=None, file=DESCRIPTOR),
_descriptor.FieldDescriptor(
name='connection_technology_type', full_name='bluetooth.metrics.BluetoothMetricsProto.BluetoothSession.connection_technology_type', index=1,
number=3, type=14, cpp_type=8, label=1,
has_default_value=False, default_value=0,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ serialized_options=None, file=DESCRIPTOR),
_descriptor.FieldDescriptor(
name='disconnect_reason', full_name='bluetooth.metrics.BluetoothMetricsProto.BluetoothSession.disconnect_reason', index=2,
number=4, type=9, cpp_type=9, label=1,
has_default_value=False, default_value=b"".decode('utf-8'),
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=b'\030\001', file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ serialized_options=b'\030\001', file=DESCRIPTOR),
_descriptor.FieldDescriptor(
name='device_connected_to', full_name='bluetooth.metrics.BluetoothMetricsProto.BluetoothSession.device_connected_to', index=3,
number=5, type=11, cpp_type=10, label=1,
has_default_value=False, default_value=None,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ serialized_options=None, file=DESCRIPTOR),
_descriptor.FieldDescriptor(
name='rfcomm_session', full_name='bluetooth.metrics.BluetoothMetricsProto.BluetoothSession.rfcomm_session', index=4,
number=6, type=11, cpp_type=10, label=1,
has_default_value=False, default_value=None,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ serialized_options=None, file=DESCRIPTOR),
_descriptor.FieldDescriptor(
name='a2dp_session', full_name='bluetooth.metrics.BluetoothMetricsProto.BluetoothSession.a2dp_session', index=5,
number=7, type=11, cpp_type=10, label=1,
has_default_value=False, default_value=None,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ serialized_options=None, file=DESCRIPTOR),
_descriptor.FieldDescriptor(
name='disconnect_reason_type', full_name='bluetooth.metrics.BluetoothMetricsProto.BluetoothSession.disconnect_reason_type', index=6,
number=8, type=14, cpp_type=8, label=1,
has_default_value=False, default_value=0,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ serialized_options=None, file=DESCRIPTOR),
],
extensions=[
],
@@ -657,7 +596,6 @@
filename=None,
file=DESCRIPTOR,
containing_type=None,
- create_key=_descriptor._internal_create_key,
fields=[
_descriptor.FieldDescriptor(
name='rx_bytes', full_name='bluetooth.metrics.BluetoothMetricsProto.RFCommSession.rx_bytes', index=0,
@@ -665,14 +603,14 @@
has_default_value=False, default_value=0,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ serialized_options=None, file=DESCRIPTOR),
_descriptor.FieldDescriptor(
name='tx_bytes', full_name='bluetooth.metrics.BluetoothMetricsProto.RFCommSession.tx_bytes', index=1,
number=2, type=5, cpp_type=1, label=1,
has_default_value=False, default_value=0,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ serialized_options=None, file=DESCRIPTOR),
],
extensions=[
],
@@ -696,7 +634,6 @@
filename=None,
file=DESCRIPTOR,
containing_type=None,
- create_key=_descriptor._internal_create_key,
fields=[
_descriptor.FieldDescriptor(
name='media_timer_min_millis', full_name='bluetooth.metrics.BluetoothMetricsProto.A2DPSession.media_timer_min_millis', index=0,
@@ -704,70 +641,70 @@
has_default_value=False, default_value=0,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ serialized_options=None, file=DESCRIPTOR),
_descriptor.FieldDescriptor(
name='media_timer_max_millis', full_name='bluetooth.metrics.BluetoothMetricsProto.A2DPSession.media_timer_max_millis', index=1,
number=2, type=5, cpp_type=1, label=1,
has_default_value=False, default_value=0,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ serialized_options=None, file=DESCRIPTOR),
_descriptor.FieldDescriptor(
name='media_timer_avg_millis', full_name='bluetooth.metrics.BluetoothMetricsProto.A2DPSession.media_timer_avg_millis', index=2,
number=3, type=5, cpp_type=1, label=1,
has_default_value=False, default_value=0,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ serialized_options=None, file=DESCRIPTOR),
_descriptor.FieldDescriptor(
name='buffer_overruns_max_count', full_name='bluetooth.metrics.BluetoothMetricsProto.A2DPSession.buffer_overruns_max_count', index=3,
number=4, type=5, cpp_type=1, label=1,
has_default_value=False, default_value=0,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ serialized_options=None, file=DESCRIPTOR),
_descriptor.FieldDescriptor(
name='buffer_overruns_total', full_name='bluetooth.metrics.BluetoothMetricsProto.A2DPSession.buffer_overruns_total', index=4,
number=5, type=5, cpp_type=1, label=1,
has_default_value=False, default_value=0,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ serialized_options=None, file=DESCRIPTOR),
_descriptor.FieldDescriptor(
name='buffer_underruns_average', full_name='bluetooth.metrics.BluetoothMetricsProto.A2DPSession.buffer_underruns_average', index=5,
number=6, type=2, cpp_type=6, label=1,
has_default_value=False, default_value=float(0),
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ serialized_options=None, file=DESCRIPTOR),
_descriptor.FieldDescriptor(
name='buffer_underruns_count', full_name='bluetooth.metrics.BluetoothMetricsProto.A2DPSession.buffer_underruns_count', index=6,
number=7, type=5, cpp_type=1, label=1,
has_default_value=False, default_value=0,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ serialized_options=None, file=DESCRIPTOR),
_descriptor.FieldDescriptor(
name='audio_duration_millis', full_name='bluetooth.metrics.BluetoothMetricsProto.A2DPSession.audio_duration_millis', index=7,
number=8, type=3, cpp_type=2, label=1,
has_default_value=False, default_value=0,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ serialized_options=None, file=DESCRIPTOR),
_descriptor.FieldDescriptor(
name='source_codec', full_name='bluetooth.metrics.BluetoothMetricsProto.A2DPSession.source_codec', index=8,
number=9, type=14, cpp_type=8, label=1,
has_default_value=False, default_value=0,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ serialized_options=None, file=DESCRIPTOR),
_descriptor.FieldDescriptor(
name='is_a2dp_offload', full_name='bluetooth.metrics.BluetoothMetricsProto.A2DPSession.is_a2dp_offload', index=9,
number=10, type=8, cpp_type=7, label=1,
has_default_value=False, default_value=False,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ serialized_options=None, file=DESCRIPTOR),
],
extensions=[
],
@@ -791,7 +728,6 @@
filename=None,
file=DESCRIPTOR,
containing_type=None,
- create_key=_descriptor._internal_create_key,
fields=[
_descriptor.FieldDescriptor(
name='disconnect_reason', full_name='bluetooth.metrics.BluetoothMetricsProto.PairEvent.disconnect_reason', index=0,
@@ -799,21 +735,21 @@
has_default_value=False, default_value=0,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ serialized_options=None, file=DESCRIPTOR),
_descriptor.FieldDescriptor(
name='event_time_millis', full_name='bluetooth.metrics.BluetoothMetricsProto.PairEvent.event_time_millis', index=1,
number=2, type=3, cpp_type=2, label=1,
has_default_value=False, default_value=0,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ serialized_options=None, file=DESCRIPTOR),
_descriptor.FieldDescriptor(
name='device_paired_with', full_name='bluetooth.metrics.BluetoothMetricsProto.PairEvent.device_paired_with', index=2,
number=3, type=11, cpp_type=10, label=1,
has_default_value=False, default_value=None,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ serialized_options=None, file=DESCRIPTOR),
],
extensions=[
],
@@ -837,7 +773,6 @@
filename=None,
file=DESCRIPTOR,
containing_type=None,
- create_key=_descriptor._internal_create_key,
fields=[
_descriptor.FieldDescriptor(
name='wake_event_type', full_name='bluetooth.metrics.BluetoothMetricsProto.WakeEvent.wake_event_type', index=0,
@@ -845,28 +780,28 @@
has_default_value=False, default_value=0,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ serialized_options=None, file=DESCRIPTOR),
_descriptor.FieldDescriptor(
name='requestor', full_name='bluetooth.metrics.BluetoothMetricsProto.WakeEvent.requestor', index=1,
number=2, type=9, cpp_type=9, label=1,
has_default_value=False, default_value=b"".decode('utf-8'),
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ serialized_options=None, file=DESCRIPTOR),
_descriptor.FieldDescriptor(
name='name', full_name='bluetooth.metrics.BluetoothMetricsProto.WakeEvent.name', index=2,
number=3, type=9, cpp_type=9, label=1,
has_default_value=False, default_value=b"".decode('utf-8'),
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ serialized_options=None, file=DESCRIPTOR),
_descriptor.FieldDescriptor(
name='event_time_millis', full_name='bluetooth.metrics.BluetoothMetricsProto.WakeEvent.event_time_millis', index=3,
number=4, type=3, cpp_type=2, label=1,
has_default_value=False, default_value=0,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ serialized_options=None, file=DESCRIPTOR),
],
extensions=[
],
@@ -891,7 +826,6 @@
filename=None,
file=DESCRIPTOR,
containing_type=None,
- create_key=_descriptor._internal_create_key,
fields=[
_descriptor.FieldDescriptor(
name='scan_event_type', full_name='bluetooth.metrics.BluetoothMetricsProto.ScanEvent.scan_event_type', index=0,
@@ -899,35 +833,35 @@
has_default_value=False, default_value=0,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ serialized_options=None, file=DESCRIPTOR),
_descriptor.FieldDescriptor(
name='initiator', full_name='bluetooth.metrics.BluetoothMetricsProto.ScanEvent.initiator', index=1,
number=2, type=9, cpp_type=9, label=1,
has_default_value=False, default_value=b"".decode('utf-8'),
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ serialized_options=None, file=DESCRIPTOR),
_descriptor.FieldDescriptor(
name='scan_technology_type', full_name='bluetooth.metrics.BluetoothMetricsProto.ScanEvent.scan_technology_type', index=2,
number=3, type=14, cpp_type=8, label=1,
has_default_value=False, default_value=0,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ serialized_options=None, file=DESCRIPTOR),
_descriptor.FieldDescriptor(
name='number_results', full_name='bluetooth.metrics.BluetoothMetricsProto.ScanEvent.number_results', index=3,
number=4, type=5, cpp_type=1, label=1,
has_default_value=False, default_value=0,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ serialized_options=None, file=DESCRIPTOR),
_descriptor.FieldDescriptor(
name='event_time_millis', full_name='bluetooth.metrics.BluetoothMetricsProto.ScanEvent.event_time_millis', index=4,
number=5, type=3, cpp_type=2, label=1,
has_default_value=False, default_value=0,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ serialized_options=None, file=DESCRIPTOR),
],
extensions=[
],
@@ -953,7 +887,6 @@
filename=None,
file=DESCRIPTOR,
containing_type=None,
- create_key=_descriptor._internal_create_key,
fields=[
_descriptor.FieldDescriptor(
name='profile_id', full_name='bluetooth.metrics.BluetoothMetricsProto.ProfileConnectionStats.profile_id', index=0,
@@ -961,14 +894,14 @@
has_default_value=False, default_value=0,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ serialized_options=None, file=DESCRIPTOR),
_descriptor.FieldDescriptor(
name='num_times_connected', full_name='bluetooth.metrics.BluetoothMetricsProto.ProfileConnectionStats.num_times_connected', index=1,
number=2, type=5, cpp_type=1, label=1,
has_default_value=False, default_value=0,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ serialized_options=None, file=DESCRIPTOR),
],
extensions=[
],
@@ -992,7 +925,6 @@
filename=None,
file=DESCRIPTOR,
containing_type=None,
- create_key=_descriptor._internal_create_key,
fields=[
_descriptor.FieldDescriptor(
name='headset_profile_type', full_name='bluetooth.metrics.BluetoothMetricsProto.HeadsetProfileConnectionStats.headset_profile_type', index=0,
@@ -1000,14 +932,14 @@
has_default_value=False, default_value=0,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ serialized_options=None, file=DESCRIPTOR),
_descriptor.FieldDescriptor(
name='num_times_connected', full_name='bluetooth.metrics.BluetoothMetricsProto.HeadsetProfileConnectionStats.num_times_connected', index=1,
number=2, type=5, cpp_type=1, label=1,
has_default_value=False, default_value=0,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ serialized_options=None, file=DESCRIPTOR),
],
extensions=[
],
diff --git a/acts_tests/acts_contrib/test_utils/bt/pts/fuchsia_pts_ics_lib.py b/acts/framework/acts/test_utils/bt/pts/fuchsia_pts_ics_lib.py
similarity index 100%
rename from acts_tests/acts_contrib/test_utils/bt/pts/fuchsia_pts_ics_lib.py
rename to acts/framework/acts/test_utils/bt/pts/fuchsia_pts_ics_lib.py
diff --git a/acts_tests/acts_contrib/test_utils/bt/pts/fuchsia_pts_ixit_lib.py b/acts/framework/acts/test_utils/bt/pts/fuchsia_pts_ixit_lib.py
similarity index 100%
rename from acts_tests/acts_contrib/test_utils/bt/pts/fuchsia_pts_ixit_lib.py
rename to acts/framework/acts/test_utils/bt/pts/fuchsia_pts_ixit_lib.py
diff --git a/acts_tests/acts_contrib/test_utils/bt/pts/pts_base_class.py b/acts/framework/acts/test_utils/bt/pts/pts_base_class.py
similarity index 98%
rename from acts_tests/acts_contrib/test_utils/bt/pts/pts_base_class.py
rename to acts/framework/acts/test_utils/bt/pts/pts_base_class.py
index 6be3d2e..07c9f8e 100644
--- a/acts_tests/acts_contrib/test_utils/bt/pts/pts_base_class.py
+++ b/acts/framework/acts/test_utils/bt/pts/pts_base_class.py
@@ -31,9 +31,9 @@
from acts.controllers.bluetooth_pts_device import VERDICT_STRINGS
from acts.controllers.fuchsia_device import FuchsiaDevice
from acts.signals import TestSignal
-from acts_contrib.test_utils.abstract_devices.bluetooth_device import create_bluetooth_device
-from acts_contrib.test_utils.bt.bt_constants import gatt_transport
-from acts_contrib.test_utils.fuchsia.bt_test_utils import le_scan_for_device_by_name
+from acts.test_utils.abstract_devices.bluetooth_device import create_bluetooth_device
+from acts.test_utils.bt.bt_constants import gatt_transport
+from acts.test_utils.fuchsia.bt_test_utils import le_scan_for_device_by_name
class PtsBaseClass(BaseTestClass):
diff --git a/acts_tests/acts_contrib/test_utils/bt/rfcomm_lib.py b/acts/framework/acts/test_utils/bt/rfcomm_lib.py
similarity index 94%
rename from acts_tests/acts_contrib/test_utils/bt/rfcomm_lib.py
rename to acts/framework/acts/test_utils/bt/rfcomm_lib.py
index f9aa117..74b1ea1 100644
--- a/acts_tests/acts_contrib/test_utils/bt/rfcomm_lib.py
+++ b/acts/framework/acts/test_utils/bt/rfcomm_lib.py
@@ -17,8 +17,8 @@
Bluetooth adapter libraries
"""
-from acts_contrib.test_utils.bt.bt_constants import bt_rfcomm_uuids
-from acts_contrib.test_utils.bt.bt_test_utils import set_bt_scan_mode
+from acts.test_utils.bt.bt_constants import bt_rfcomm_uuids
+from acts.test_utils.bt.bt_test_utils import set_bt_scan_mode
import pprint
diff --git a/acts_tests/acts_contrib/test_utils/bt/shell_commands_lib.py b/acts/framework/acts/test_utils/bt/shell_commands_lib.py
similarity index 100%
rename from acts_tests/acts_contrib/test_utils/bt/shell_commands_lib.py
rename to acts/framework/acts/test_utils/bt/shell_commands_lib.py
diff --git a/acts_tests/acts_contrib/test_utils/bt/simulated_carkit_device.py b/acts/framework/acts/test_utils/bt/simulated_carkit_device.py
similarity index 96%
rename from acts_tests/acts_contrib/test_utils/bt/simulated_carkit_device.py
rename to acts/framework/acts/test_utils/bt/simulated_carkit_device.py
index 03ccdef..84fcc5e 100644
--- a/acts_tests/acts_contrib/test_utils/bt/simulated_carkit_device.py
+++ b/acts/framework/acts/test_utils/bt/simulated_carkit_device.py
@@ -17,7 +17,7 @@
from acts import asserts
from acts.controllers import android_device
-from acts_contrib.test_utils.bt.bt_test_utils import bluetooth_enabled_check
+from acts.test_utils.bt.bt_test_utils import bluetooth_enabled_check
# TODO: This class to be deprecated for
# ../acts/test_utils/abstract_devices/bluetooth_handsfree_abstract_device.py
diff --git a/acts_tests/acts_contrib/test_utils/car/__init__.py b/acts/framework/acts/test_utils/car/__init__.py
similarity index 100%
rename from acts_tests/acts_contrib/test_utils/car/__init__.py
rename to acts/framework/acts/test_utils/car/__init__.py
diff --git a/acts_tests/acts_contrib/test_utils/car/car_bt_utils.py b/acts/framework/acts/test_utils/car/car_bt_utils.py
similarity index 94%
rename from acts_tests/acts_contrib/test_utils/car/car_bt_utils.py
rename to acts/framework/acts/test_utils/car/car_bt_utils.py
index a428528..73247a4 100644
--- a/acts_tests/acts_contrib/test_utils/car/car_bt_utils.py
+++ b/acts/framework/acts/test_utils/car/car_bt_utils.py
@@ -30,8 +30,8 @@
import time
from acts import logger
-from acts_contrib.test_utils.bt import bt_test_utils
-from acts_contrib.test_utils.bt.BtEnum import *
+from acts.test_utils.bt import bt_test_utils
+from acts.test_utils.bt.BtEnum import *
def set_car_profile_priorities_off(car_droid, ph_droid):
diff --git a/acts_tests/acts_contrib/test_utils/car/car_media_utils.py b/acts/framework/acts/test_utils/car/car_media_utils.py
similarity index 100%
rename from acts_tests/acts_contrib/test_utils/car/car_media_utils.py
rename to acts/framework/acts/test_utils/car/car_media_utils.py
diff --git a/acts_tests/acts_contrib/test_utils/car/car_telecom_utils.py b/acts/framework/acts/test_utils/car/car_telecom_utils.py
similarity index 99%
rename from acts_tests/acts_contrib/test_utils/car/car_telecom_utils.py
rename to acts/framework/acts/test_utils/car/car_telecom_utils.py
index 7dbac40..4516aea 100644
--- a/acts_tests/acts_contrib/test_utils/car/car_telecom_utils.py
+++ b/acts/framework/acts/test_utils/car/car_telecom_utils.py
@@ -30,7 +30,7 @@
import time
from acts import logger
-from acts_contrib.test_utils.tel import tel_defines
+from acts.test_utils.tel import tel_defines
def dial_number(log, ad, uri):
"""Dial a number
diff --git a/acts_tests/acts_contrib/test_utils/car/tel_telecom_utils.py b/acts/framework/acts/test_utils/car/tel_telecom_utils.py
similarity index 99%
rename from acts_tests/acts_contrib/test_utils/car/tel_telecom_utils.py
rename to acts/framework/acts/test_utils/car/tel_telecom_utils.py
index fb0fc84..51a7ba9 100644
--- a/acts_tests/acts_contrib/test_utils/car/tel_telecom_utils.py
+++ b/acts/framework/acts/test_utils/car/tel_telecom_utils.py
@@ -22,7 +22,7 @@
import time
from acts import logger
-from acts_contrib.test_utils.tel import tel_defines
+from acts.test_utils.tel import tel_defines
def dial_number(log, ad, uri):
"""Dial a Tel: URI
diff --git a/acts_tests/acts_contrib/test_utils/coex/CoexBaseTest.py b/acts/framework/acts/test_utils/coex/CoexBaseTest.py
similarity index 90%
rename from acts_tests/acts_contrib/test_utils/coex/CoexBaseTest.py
rename to acts/framework/acts/test_utils/coex/CoexBaseTest.py
index e0532d9..b64b913 100644
--- a/acts_tests/acts_contrib/test_utils/coex/CoexBaseTest.py
+++ b/acts/framework/acts/test_utils/coex/CoexBaseTest.py
@@ -22,24 +22,24 @@
from acts.base_test import BaseTestClass
from acts.controllers import android_device
from acts.controllers import relay_device_controller
-from acts_contrib.test_utils.bt.bt_test_utils import disable_bluetooth
-from acts_contrib.test_utils.bt.bt_test_utils import enable_bluetooth
-from acts_contrib.test_utils.bt.bt_test_utils import setup_multiple_devices_for_bt_test
-from acts_contrib.test_utils.bt.bt_test_utils import take_btsnoop_logs
-from acts_contrib.test_utils.coex.coex_test_utils import A2dpDumpsysParser
-from acts_contrib.test_utils.coex.coex_test_utils import (
+from acts.test_utils.bt.bt_test_utils import disable_bluetooth
+from acts.test_utils.bt.bt_test_utils import enable_bluetooth
+from acts.test_utils.bt.bt_test_utils import setup_multiple_devices_for_bt_test
+from acts.test_utils.bt.bt_test_utils import take_btsnoop_logs
+from acts.test_utils.coex.coex_test_utils import A2dpDumpsysParser
+from acts.test_utils.coex.coex_test_utils import (
collect_bluetooth_manager_dumpsys_logs)
-from acts_contrib.test_utils.coex.coex_test_utils import configure_and_start_ap
-from acts_contrib.test_utils.coex.coex_test_utils import iperf_result
-from acts_contrib.test_utils.coex.coex_test_utils import parse_fping_results
-from acts_contrib.test_utils.coex.coex_test_utils import wifi_connection_check
-from acts_contrib.test_utils.wifi import wifi_retail_ap as retail_ap
-from acts_contrib.test_utils.wifi.wifi_performance_test_utils import get_iperf_arg_string
-from acts_contrib.test_utils.wifi.wifi_power_test_utils import get_phone_ip
-from acts_contrib.test_utils.wifi.wifi_test_utils import reset_wifi
-from acts_contrib.test_utils.wifi.wifi_test_utils import wifi_connect
-from acts_contrib.test_utils.wifi.wifi_test_utils import wifi_test_device_init
-from acts_contrib.test_utils.wifi.wifi_test_utils import wifi_toggle_state
+from acts.test_utils.coex.coex_test_utils import configure_and_start_ap
+from acts.test_utils.coex.coex_test_utils import iperf_result
+from acts.test_utils.coex.coex_test_utils import parse_fping_results
+from acts.test_utils.coex.coex_test_utils import wifi_connection_check
+from acts.test_utils.wifi import wifi_retail_ap as retail_ap
+from acts.test_utils.wifi.wifi_performance_test_utils import get_iperf_arg_string
+from acts.test_utils.wifi.wifi_power_test_utils import get_phone_ip
+from acts.test_utils.wifi.wifi_test_utils import reset_wifi
+from acts.test_utils.wifi.wifi_test_utils import wifi_connect
+from acts.test_utils.wifi.wifi_test_utils import wifi_test_device_init
+from acts.test_utils.wifi.wifi_test_utils import wifi_toggle_state
AVRCP_WAIT_TIME = 3
diff --git a/acts_tests/acts_contrib/test_utils/coex/CoexPerformanceBaseTest.py b/acts/framework/acts/test_utils/coex/CoexPerformanceBaseTest.py
similarity index 96%
rename from acts_tests/acts_contrib/test_utils/coex/CoexPerformanceBaseTest.py
rename to acts/framework/acts/test_utils/coex/CoexPerformanceBaseTest.py
index 3180660..9624602 100644
--- a/acts_tests/acts_contrib/test_utils/coex/CoexPerformanceBaseTest.py
+++ b/acts/framework/acts/test_utils/coex/CoexPerformanceBaseTest.py
@@ -20,16 +20,16 @@
from collections import defaultdict
from acts.metrics.loggers.blackbox import BlackboxMetricLogger
-from acts_contrib.test_utils.bt.bt_test_utils import disable_bluetooth
-from acts_contrib.test_utils.coex.audio_test_utils import AudioCaptureResult
-from acts_contrib.test_utils.coex.audio_test_utils import get_audio_capture_device
-from acts_contrib.test_utils.coex.CoexBaseTest import CoexBaseTest
-from acts_contrib.test_utils.coex.coex_test_utils import bokeh_chart_plot
-from acts_contrib.test_utils.coex.coex_test_utils import collect_bluetooth_manager_dumpsys_logs
-from acts_contrib.test_utils.coex.coex_test_utils import multithread_func
-from acts_contrib.test_utils.coex.coex_test_utils import wifi_connection_check
-from acts_contrib.test_utils.wifi.wifi_test_utils import wifi_connect
-from acts_contrib.test_utils.wifi.wifi_test_utils import wifi_test_device_init
+from acts.test_utils.bt.bt_test_utils import disable_bluetooth
+from acts.test_utils.coex.audio_test_utils import AudioCaptureResult
+from acts.test_utils.coex.audio_test_utils import get_audio_capture_device
+from acts.test_utils.coex.CoexBaseTest import CoexBaseTest
+from acts.test_utils.coex.coex_test_utils import bokeh_chart_plot
+from acts.test_utils.coex.coex_test_utils import collect_bluetooth_manager_dumpsys_logs
+from acts.test_utils.coex.coex_test_utils import multithread_func
+from acts.test_utils.coex.coex_test_utils import wifi_connection_check
+from acts.test_utils.wifi.wifi_test_utils import wifi_connect
+from acts.test_utils.wifi.wifi_test_utils import wifi_test_device_init
from acts.utils import get_current_epoch_time
RSSI_POLL_RESULTS = 'Monitoring , Handle: 0x0003, POLL'
diff --git a/acts_tests/acts_contrib/test_utils/coex/__init__.py b/acts/framework/acts/test_utils/coex/__init__.py
similarity index 100%
rename from acts_tests/acts_contrib/test_utils/coex/__init__.py
rename to acts/framework/acts/test_utils/coex/__init__.py
diff --git a/acts_tests/acts_contrib/test_utils/coex/audio_capture_device.py b/acts/framework/acts/test_utils/coex/audio_capture_device.py
similarity index 100%
rename from acts_tests/acts_contrib/test_utils/coex/audio_capture_device.py
rename to acts/framework/acts/test_utils/coex/audio_capture_device.py
diff --git a/acts_tests/acts_contrib/test_utils/coex/audio_test_utils.py b/acts/framework/acts/test_utils/coex/audio_test_utils.py
similarity index 94%
rename from acts_tests/acts_contrib/test_utils/coex/audio_test_utils.py
rename to acts/framework/acts/test_utils/coex/audio_test_utils.py
index 39543a3..f4dc403 100644
--- a/acts_tests/acts_contrib/test_utils/coex/audio_test_utils.py
+++ b/acts/framework/acts/test_utils/coex/audio_test_utils.py
@@ -19,11 +19,11 @@
import os
import scipy.io.wavfile as sciwav
-from acts_contrib.test_utils.coex.audio_capture_device import AudioCaptureBase
-from acts_contrib.test_utils.coex.audio_capture_device import CaptureAudioOverAdb
-from acts_contrib.test_utils.coex.audio_capture_device import CaptureAudioOverLocal
-from acts_contrib.test_utils.audio_analysis_lib import audio_analysis
-from acts_contrib.test_utils.audio_analysis_lib.check_quality import quality_analysis
+from acts.test_utils.coex.audio_capture_device import AudioCaptureBase
+from acts.test_utils.coex.audio_capture_device import CaptureAudioOverAdb
+from acts.test_utils.coex.audio_capture_device import CaptureAudioOverLocal
+from acts.test_utils.audio_analysis_lib import audio_analysis
+from acts.test_utils.audio_analysis_lib.check_quality import quality_analysis
ANOMALY_DETECTION_BLOCK_SIZE = audio_analysis.ANOMALY_DETECTION_BLOCK_SIZE
ANOMALY_GROUPING_TOLERANCE = audio_analysis.ANOMALY_GROUPING_TOLERANCE
diff --git a/acts_tests/acts_contrib/test_utils/coex/coex_test_utils.py b/acts/framework/acts/test_utils/coex/coex_test_utils.py
similarity index 95%
rename from acts_tests/acts_contrib/test_utils/coex/coex_test_utils.py
rename to acts/framework/acts/test_utils/coex/coex_test_utils.py
index 62e12af..daae506 100644
--- a/acts_tests/acts_contrib/test_utils/coex/coex_test_utils.py
+++ b/acts/framework/acts/test_utils/coex/coex_test_utils.py
@@ -29,37 +29,37 @@
from acts.controllers.utils_lib.ssh import settings
from acts.controllers.iperf_server import IPerfResult
from acts.libs.proc import job
-from acts_contrib.test_utils.bt.bt_constants import (
+from acts.test_utils.bt.bt_constants import (
bluetooth_profile_connection_state_changed)
-from acts_contrib.test_utils.bt.bt_constants import bt_default_timeout
-from acts_contrib.test_utils.bt.bt_constants import bt_profile_constants
-from acts_contrib.test_utils.bt.bt_constants import bt_profile_states
-from acts_contrib.test_utils.bt.bt_constants import bt_scan_mode_types
-from acts_contrib.test_utils.bt.bt_gatt_utils import GattTestUtilsError
-from acts_contrib.test_utils.bt.bt_gatt_utils import orchestrate_gatt_connection
-from acts_contrib.test_utils.bt.bt_test_utils import disable_bluetooth
-from acts_contrib.test_utils.bt.bt_test_utils import enable_bluetooth
-from acts_contrib.test_utils.bt.bt_test_utils import is_a2dp_src_device_connected
-from acts_contrib.test_utils.bt.bt_test_utils import is_a2dp_snk_device_connected
-from acts_contrib.test_utils.bt.bt_test_utils import is_hfp_client_device_connected
-from acts_contrib.test_utils.bt.bt_test_utils import is_map_mce_device_connected
-from acts_contrib.test_utils.bt.bt_test_utils import is_map_mse_device_connected
-from acts_contrib.test_utils.bt.bt_test_utils import set_bt_scan_mode
-from acts_contrib.test_utils.car.car_telecom_utils import wait_for_active
-from acts_contrib.test_utils.car.car_telecom_utils import wait_for_dialing
-from acts_contrib.test_utils.car.car_telecom_utils import wait_for_not_in_call
-from acts_contrib.test_utils.car.car_telecom_utils import wait_for_ringing
-from acts_contrib.test_utils.tel.tel_test_utils import get_phone_number
-from acts_contrib.test_utils.tel.tel_test_utils import hangup_call
-from acts_contrib.test_utils.tel.tel_test_utils import initiate_call
-from acts_contrib.test_utils.tel.tel_test_utils import run_multithread_func
-from acts_contrib.test_utils.tel.tel_test_utils import setup_droid_properties
-from acts_contrib.test_utils.tel.tel_test_utils import wait_and_answer_call
-from acts_contrib.test_utils.wifi.wifi_power_test_utils import get_phone_ip
-from acts_contrib.test_utils.wifi.wifi_test_utils import reset_wifi
-from acts_contrib.test_utils.wifi.wifi_test_utils import wifi_connect
-from acts_contrib.test_utils.wifi.wifi_test_utils import wifi_test_device_init
-from acts_contrib.test_utils.wifi.wifi_test_utils import wifi_toggle_state
+from acts.test_utils.bt.bt_constants import bt_default_timeout
+from acts.test_utils.bt.bt_constants import bt_profile_constants
+from acts.test_utils.bt.bt_constants import bt_profile_states
+from acts.test_utils.bt.bt_constants import bt_scan_mode_types
+from acts.test_utils.bt.bt_gatt_utils import GattTestUtilsError
+from acts.test_utils.bt.bt_gatt_utils import orchestrate_gatt_connection
+from acts.test_utils.bt.bt_test_utils import disable_bluetooth
+from acts.test_utils.bt.bt_test_utils import enable_bluetooth
+from acts.test_utils.bt.bt_test_utils import is_a2dp_src_device_connected
+from acts.test_utils.bt.bt_test_utils import is_a2dp_snk_device_connected
+from acts.test_utils.bt.bt_test_utils import is_hfp_client_device_connected
+from acts.test_utils.bt.bt_test_utils import is_map_mce_device_connected
+from acts.test_utils.bt.bt_test_utils import is_map_mse_device_connected
+from acts.test_utils.bt.bt_test_utils import set_bt_scan_mode
+from acts.test_utils.car.car_telecom_utils import wait_for_active
+from acts.test_utils.car.car_telecom_utils import wait_for_dialing
+from acts.test_utils.car.car_telecom_utils import wait_for_not_in_call
+from acts.test_utils.car.car_telecom_utils import wait_for_ringing
+from acts.test_utils.tel.tel_test_utils import get_phone_number
+from acts.test_utils.tel.tel_test_utils import hangup_call
+from acts.test_utils.tel.tel_test_utils import initiate_call
+from acts.test_utils.tel.tel_test_utils import run_multithread_func
+from acts.test_utils.tel.tel_test_utils import setup_droid_properties
+from acts.test_utils.tel.tel_test_utils import wait_and_answer_call
+from acts.test_utils.wifi.wifi_power_test_utils import get_phone_ip
+from acts.test_utils.wifi.wifi_test_utils import reset_wifi
+from acts.test_utils.wifi.wifi_test_utils import wifi_connect
+from acts.test_utils.wifi.wifi_test_utils import wifi_test_device_init
+from acts.test_utils.wifi.wifi_test_utils import wifi_toggle_state
from acts.utils import exe_cmd
from bokeh.layouts import column
from bokeh.models import tools as bokeh_tools
diff --git a/acts_tests/acts_contrib/test_utils/coex/hotspot_utils.py b/acts/framework/acts/test_utils/coex/hotspot_utils.py
similarity index 100%
rename from acts_tests/acts_contrib/test_utils/coex/hotspot_utils.py
rename to acts/framework/acts/test_utils/coex/hotspot_utils.py
diff --git a/acts_tests/acts_contrib/test_utils/fuchsia/__init__.py b/acts/framework/acts/test_utils/fuchsia/__init__.py
similarity index 100%
rename from acts_tests/acts_contrib/test_utils/fuchsia/__init__.py
rename to acts/framework/acts/test_utils/fuchsia/__init__.py
diff --git a/acts_tests/acts_contrib/test_utils/fuchsia/bt_test_utils.py b/acts/framework/acts/test_utils/fuchsia/bt_test_utils.py
similarity index 100%
rename from acts_tests/acts_contrib/test_utils/fuchsia/bt_test_utils.py
rename to acts/framework/acts/test_utils/fuchsia/bt_test_utils.py
diff --git a/acts_tests/acts_contrib/test_utils/fuchsia/sdp_records.py b/acts/framework/acts/test_utils/fuchsia/sdp_records.py
similarity index 98%
rename from acts_tests/acts_contrib/test_utils/fuchsia/sdp_records.py
rename to acts/framework/acts/test_utils/fuchsia/sdp_records.py
index 1da2e62..c5daabd 100644
--- a/acts_tests/acts_contrib/test_utils/fuchsia/sdp_records.py
+++ b/acts/framework/acts/test_utils/fuchsia/sdp_records.py
@@ -14,8 +14,8 @@
# License for the specific language governing permissions and limitations under
# the License.
-from acts_contrib.test_utils.bt.bt_constants import bt_attribute_values
-from acts_contrib.test_utils.bt.bt_constants import sig_uuid_constants
+from acts.test_utils.bt.bt_constants import bt_attribute_values
+from acts.test_utils.bt.bt_constants import sig_uuid_constants
BASE_UUID = sig_uuid_constants['BASE_UUID']
diff --git a/acts_tests/acts_contrib/test_utils/fuchsia/utils.py b/acts/framework/acts/test_utils/fuchsia/utils.py
similarity index 100%
rename from acts_tests/acts_contrib/test_utils/fuchsia/utils.py
rename to acts/framework/acts/test_utils/fuchsia/utils.py
diff --git a/acts_tests/acts_contrib/test_utils/gnss/__init__.py b/acts/framework/acts/test_utils/gnss/__init__.py
similarity index 100%
rename from acts_tests/acts_contrib/test_utils/gnss/__init__.py
rename to acts/framework/acts/test_utils/gnss/__init__.py
diff --git a/acts_tests/acts_contrib/test_utils/gnss/dut_log_test_utils.py b/acts/framework/acts/test_utils/gnss/dut_log_test_utils.py
similarity index 100%
rename from acts_tests/acts_contrib/test_utils/gnss/dut_log_test_utils.py
rename to acts/framework/acts/test_utils/gnss/dut_log_test_utils.py
diff --git a/acts_tests/acts_contrib/test_utils/gnss/gnss_test_utils.py b/acts/framework/acts/test_utils/gnss/gnss_test_utils.py
similarity index 98%
rename from acts_tests/acts_contrib/test_utils/gnss/gnss_test_utils.py
rename to acts/framework/acts/test_utils/gnss/gnss_test_utils.py
index 0c94b49..894cda1 100644
--- a/acts_tests/acts_contrib/test_utils/gnss/gnss_test_utils.py
+++ b/acts/framework/acts/test_utils/gnss/gnss_test_utils.py
@@ -31,10 +31,10 @@
from acts.controllers.android_device import list_fastboot_devices
from acts.controllers.android_device import DEFAULT_QXDM_LOG_PATH
from acts.controllers.android_device import SL4A_APK_NAME
-from acts_contrib.test_utils.wifi import wifi_test_utils as wutils
-from acts_contrib.test_utils.tel import tel_test_utils as tutils
-from acts_contrib.test_utils.instrumentation.device.command.instrumentation_command_builder import InstrumentationCommandBuilder
-from acts_contrib.test_utils.instrumentation.device.command.instrumentation_command_builder import InstrumentationTestCommandBuilder
+from acts.test_utils.wifi import wifi_test_utils as wutils
+from acts.test_utils.tel import tel_test_utils as tutils
+from acts.test_utils.instrumentation.device.command.instrumentation_command_builder import InstrumentationCommandBuilder
+from acts.test_utils.instrumentation.device.command.instrumentation_command_builder import InstrumentationTestCommandBuilder
from acts.utils import get_current_epoch_time
from acts.utils import epoch_to_human_time
diff --git a/acts_tests/acts_contrib/test_utils/gnss/gnss_testlog_utils.py b/acts/framework/acts/test_utils/gnss/gnss_testlog_utils.py
similarity index 100%
rename from acts_tests/acts_contrib/test_utils/gnss/gnss_testlog_utils.py
rename to acts/framework/acts/test_utils/gnss/gnss_testlog_utils.py
diff --git a/acts_tests/acts_contrib/test_utils/instrumentation/__init__.py b/acts/framework/acts/test_utils/instrumentation/__init__.py
similarity index 100%
rename from acts_tests/acts_contrib/test_utils/instrumentation/__init__.py
rename to acts/framework/acts/test_utils/instrumentation/__init__.py
diff --git a/acts_tests/acts_contrib/test_utils/instrumentation/config_wrapper.py b/acts/framework/acts/test_utils/instrumentation/config_wrapper.py
similarity index 100%
rename from acts_tests/acts_contrib/test_utils/instrumentation/config_wrapper.py
rename to acts/framework/acts/test_utils/instrumentation/config_wrapper.py
diff --git a/acts_tests/acts_contrib/test_utils/instrumentation/device/__init__.py b/acts/framework/acts/test_utils/instrumentation/device/__init__.py
similarity index 100%
rename from acts_tests/acts_contrib/test_utils/instrumentation/device/__init__.py
rename to acts/framework/acts/test_utils/instrumentation/device/__init__.py
diff --git a/acts_tests/acts_contrib/test_utils/instrumentation/device/apps/__init__.py b/acts/framework/acts/test_utils/instrumentation/device/apps/__init__.py
similarity index 100%
rename from acts_tests/acts_contrib/test_utils/instrumentation/device/apps/__init__.py
rename to acts/framework/acts/test_utils/instrumentation/device/apps/__init__.py
diff --git a/acts_tests/acts_contrib/test_utils/instrumentation/device/apps/app_installer.py b/acts/framework/acts/test_utils/instrumentation/device/apps/app_installer.py
similarity index 100%
rename from acts_tests/acts_contrib/test_utils/instrumentation/device/apps/app_installer.py
rename to acts/framework/acts/test_utils/instrumentation/device/apps/app_installer.py
diff --git a/acts_tests/acts_contrib/test_utils/instrumentation/device/apps/dismiss_dialogs.py b/acts/framework/acts/test_utils/instrumentation/device/apps/dismiss_dialogs.py
similarity index 93%
rename from acts_tests/acts_contrib/test_utils/instrumentation/device/apps/dismiss_dialogs.py
rename to acts/framework/acts/test_utils/instrumentation/device/apps/dismiss_dialogs.py
index 72f240b..909326a 100644
--- a/acts_tests/acts_contrib/test_utils/instrumentation/device/apps/dismiss_dialogs.py
+++ b/acts/framework/acts/test_utils/instrumentation/device/apps/dismiss_dialogs.py
@@ -16,9 +16,9 @@
import os
-from acts_contrib.test_utils.instrumentation.device.apps.app_installer import \
+from acts.test_utils.instrumentation.device.apps.app_installer import \
AppInstaller
-from acts_contrib.test_utils.instrumentation.device.command.instrumentation_command_builder \
+from acts.test_utils.instrumentation.device.command.instrumentation_command_builder \
import InstrumentationCommandBuilder
DISMISS_DIALOGS_RUNNER = '.DismissDialogsInstrumentation'
diff --git a/acts_tests/acts_contrib/test_utils/instrumentation/device/apps/google_account_util.py b/acts/framework/acts/test_utils/instrumentation/device/apps/google_account_util.py
similarity index 92%
rename from acts_tests/acts_contrib/test_utils/instrumentation/device/apps/google_account_util.py
rename to acts/framework/acts/test_utils/instrumentation/device/apps/google_account_util.py
index a0ba36a..ffb7cf2 100644
--- a/acts_tests/acts_contrib/test_utils/instrumentation/device/apps/google_account_util.py
+++ b/acts/framework/acts/test_utils/instrumentation/device/apps/google_account_util.py
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-from acts_contrib.test_utils.instrumentation.device.apps.app_installer import \
+from acts.test_utils.instrumentation.device.apps.app_installer import \
AppInstaller
class GoogleAccountUtil(object):
diff --git a/acts_tests/acts_contrib/test_utils/instrumentation/device/apps/google_apps_test_utils.py b/acts/framework/acts/test_utils/instrumentation/device/apps/google_apps_test_utils.py
similarity index 91%
rename from acts_tests/acts_contrib/test_utils/instrumentation/device/apps/google_apps_test_utils.py
rename to acts/framework/acts/test_utils/instrumentation/device/apps/google_apps_test_utils.py
index 3f0733f..08f2a5d 100644
--- a/acts_tests/acts_contrib/test_utils/instrumentation/device/apps/google_apps_test_utils.py
+++ b/acts/framework/acts/test_utils/instrumentation/device/apps/google_apps_test_utils.py
@@ -14,9 +14,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-from acts_contrib.test_utils.instrumentation.device.apps.app_installer import \
+from acts.test_utils.instrumentation.device.apps.app_installer import \
AppInstaller
-from acts_contrib.test_utils.instrumentation.device.command.instrumentation_command_builder \
+from acts.test_utils.instrumentation.device.command.instrumentation_command_builder \
import InstrumentationCommandBuilder
ACTIVITY = '.FinskyInstrumentation'
diff --git a/acts_tests/acts_contrib/test_utils/instrumentation/device/apps/hotword_model_extractor.py b/acts/framework/acts/test_utils/instrumentation/device/apps/hotword_model_extractor.py
similarity index 96%
rename from acts_tests/acts_contrib/test_utils/instrumentation/device/apps/hotword_model_extractor.py
rename to acts/framework/acts/test_utils/instrumentation/device/apps/hotword_model_extractor.py
index b7772af..57386b9 100644
--- a/acts_tests/acts_contrib/test_utils/instrumentation/device/apps/hotword_model_extractor.py
+++ b/acts/framework/acts/test_utils/instrumentation/device/apps/hotword_model_extractor.py
@@ -18,7 +18,7 @@
import tempfile
import zipfile
-from acts_contrib.test_utils.instrumentation.device.apps.app_installer \
+from acts.test_utils.instrumentation.device.apps.app_installer \
import AppInstaller
DEFAULT_MODEL_NAME = 'en_us.mmap'
diff --git a/acts_tests/acts_contrib/test_utils/instrumentation/device/apps/modem_diag_util.py b/acts/framework/acts/test_utils/instrumentation/device/apps/modem_diag_util.py
similarity index 95%
rename from acts_tests/acts_contrib/test_utils/instrumentation/device/apps/modem_diag_util.py
rename to acts/framework/acts/test_utils/instrumentation/device/apps/modem_diag_util.py
index cf558c3..59591b7 100644
--- a/acts_tests/acts_contrib/test_utils/instrumentation/device/apps/modem_diag_util.py
+++ b/acts/framework/acts/test_utils/instrumentation/device/apps/modem_diag_util.py
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-from acts_contrib.test_utils.instrumentation.device.apps.app_installer import \
+from acts.test_utils.instrumentation.device.apps.app_installer import \
AppInstaller
class ModemDiagUtil(object):
diff --git a/acts_tests/acts_contrib/test_utils/instrumentation/device/apps/permissions.py b/acts/framework/acts/test_utils/instrumentation/device/apps/permissions.py
similarity index 90%
rename from acts_tests/acts_contrib/test_utils/instrumentation/device/apps/permissions.py
rename to acts/framework/acts/test_utils/instrumentation/device/apps/permissions.py
index 33f7f58..db1f131 100644
--- a/acts_tests/acts_contrib/test_utils/instrumentation/device/apps/permissions.py
+++ b/acts/framework/acts/test_utils/instrumentation/device/apps/permissions.py
@@ -14,9 +14,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-from acts_contrib.test_utils.instrumentation.device.apps.app_installer import \
+from acts.test_utils.instrumentation.device.apps.app_installer import \
AppInstaller
-from acts_contrib.test_utils.instrumentation.device.command.instrumentation_command_builder \
+from acts.test_utils.instrumentation.device.command.instrumentation_command_builder \
import InstrumentationCommandBuilder
PERMISSION_RUNNER = '.PermissionInstrumentation'
diff --git a/acts_tests/acts_contrib/test_utils/instrumentation/device/command/__init__.py b/acts/framework/acts/test_utils/instrumentation/device/command/__init__.py
similarity index 100%
rename from acts_tests/acts_contrib/test_utils/instrumentation/device/command/__init__.py
rename to acts/framework/acts/test_utils/instrumentation/device/command/__init__.py
diff --git a/acts_tests/acts_contrib/test_utils/instrumentation/device/command/adb_command_types.py b/acts/framework/acts/test_utils/instrumentation/device/command/adb_command_types.py
similarity index 98%
rename from acts_tests/acts_contrib/test_utils/instrumentation/device/command/adb_command_types.py
rename to acts/framework/acts/test_utils/instrumentation/device/command/adb_command_types.py
index c65d8a8..574385b 100644
--- a/acts_tests/acts_contrib/test_utils/instrumentation/device/command/adb_command_types.py
+++ b/acts/framework/acts/test_utils/instrumentation/device/command/adb_command_types.py
@@ -17,7 +17,7 @@
import logging
from acts import tracelogger
-from acts_contrib.test_utils.instrumentation.device.command.intent_builder import IntentBuilder
+from acts.test_utils.instrumentation.device.command.intent_builder import IntentBuilder
DESCRIPTION_MISSING_MESSAGE = (
'Description for command is mandatory. Provide a brief description on what '
diff --git a/acts_tests/acts_contrib/test_utils/instrumentation/device/command/adb_commands/__init__.py b/acts/framework/acts/test_utils/instrumentation/device/command/adb_commands/__init__.py
similarity index 100%
rename from acts_tests/acts_contrib/test_utils/instrumentation/device/command/adb_commands/__init__.py
rename to acts/framework/acts/test_utils/instrumentation/device/command/adb_commands/__init__.py
diff --git a/acts_tests/acts_contrib/test_utils/instrumentation/device/command/adb_commands/common.py b/acts/framework/acts/test_utils/instrumentation/device/command/adb_commands/common.py
similarity index 96%
rename from acts_tests/acts_contrib/test_utils/instrumentation/device/command/adb_commands/common.py
rename to acts/framework/acts/test_utils/instrumentation/device/command/adb_commands/common.py
index 677eaf7..2a926c0 100644
--- a/acts_tests/acts_contrib/test_utils/instrumentation/device/command/adb_commands/common.py
+++ b/acts/framework/acts/test_utils/instrumentation/device/command/adb_commands/common.py
@@ -15,15 +15,15 @@
# limitations under the License.
"""Common device settings for power testing."""
-from acts_contrib.test_utils.instrumentation.device.command.adb_command_types import \
+from acts.test_utils.instrumentation.device.command.adb_command_types import \
DeviceBinaryCommandSeries
-from acts_contrib.test_utils.instrumentation.device.command.adb_command_types import \
+from acts.test_utils.instrumentation.device.command.adb_command_types import \
DeviceSetprop
-from acts_contrib.test_utils.instrumentation.device.command.adb_command_types import \
+from acts.test_utils.instrumentation.device.command.adb_command_types import \
DeviceSetting
-from acts_contrib.test_utils.instrumentation.device.command.adb_command_types import \
+from acts.test_utils.instrumentation.device.command.adb_command_types import \
DeviceState
-from acts_contrib.test_utils.instrumentation.device.command.adb_command_types import \
+from acts.test_utils.instrumentation.device.command.adb_command_types import \
GenericCommand
# Network/Connectivity
diff --git a/acts_tests/acts_contrib/test_utils/instrumentation/device/command/adb_commands/goog.py b/acts/framework/acts/test_utils/instrumentation/device/command/adb_commands/goog.py
similarity index 92%
rename from acts_tests/acts_contrib/test_utils/instrumentation/device/command/adb_commands/goog.py
rename to acts/framework/acts/test_utils/instrumentation/device/command/adb_commands/goog.py
index fd676b7..94ff1aa 100644
--- a/acts_tests/acts_contrib/test_utils/instrumentation/device/command/adb_commands/goog.py
+++ b/acts/framework/acts/test_utils/instrumentation/device/command/adb_commands/goog.py
@@ -15,17 +15,17 @@
# limitations under the License.
"""Google-internal device settings for power testing."""
-from acts_contrib.test_utils.instrumentation.device.command.adb_command_types import \
+from acts.test_utils.instrumentation.device.command.adb_command_types import \
DeviceBinaryCommandSeries
-from acts_contrib.test_utils.instrumentation.device.command.adb_command_types import \
+from acts.test_utils.instrumentation.device.command.adb_command_types import \
DeviceGServices
-from acts_contrib.test_utils.instrumentation.device.command.adb_command_types import \
+from acts.test_utils.instrumentation.device.command.adb_command_types import \
DeviceState
-from acts_contrib.test_utils.instrumentation.device.command.adb_command_types import \
+from acts.test_utils.instrumentation.device.command.adb_command_types import \
DeviceSetprop
-from acts_contrib.test_utils.instrumentation.device.command.adb_command_types import \
+from acts.test_utils.instrumentation.device.command.adb_command_types import \
DeviceSetting
-from acts_contrib.test_utils.instrumentation.device.command.adb_command_types import \
+from acts.test_utils.instrumentation.device.command.adb_command_types import \
GenericCommand
# Location
diff --git a/acts_tests/acts_contrib/test_utils/instrumentation/device/command/instrumentation_command_builder.py b/acts/framework/acts/test_utils/instrumentation/device/command/instrumentation_command_builder.py
similarity index 100%
rename from acts_tests/acts_contrib/test_utils/instrumentation/device/command/instrumentation_command_builder.py
rename to acts/framework/acts/test_utils/instrumentation/device/command/instrumentation_command_builder.py
diff --git a/acts_tests/acts_contrib/test_utils/instrumentation/device/command/intent_builder.py b/acts/framework/acts/test_utils/instrumentation/device/command/intent_builder.py
similarity index 100%
rename from acts_tests/acts_contrib/test_utils/instrumentation/device/command/intent_builder.py
rename to acts/framework/acts/test_utils/instrumentation/device/command/intent_builder.py
diff --git a/acts_tests/acts_contrib/test_utils/instrumentation/instrumentation_base_test.py b/acts/framework/acts/test_utils/instrumentation/instrumentation_base_test.py
similarity index 95%
rename from acts_tests/acts_contrib/test_utils/instrumentation/instrumentation_base_test.py
rename to acts/framework/acts/test_utils/instrumentation/instrumentation_base_test.py
index f798462..3eda72a 100644
--- a/acts_tests/acts_contrib/test_utils/instrumentation/instrumentation_base_test.py
+++ b/acts/framework/acts/test_utils/instrumentation/instrumentation_base_test.py
@@ -23,11 +23,11 @@
from acts.controllers.adb import DEFAULT_ADB_TIMEOUT
-from acts_contrib.test_utils.instrumentation import instrumentation_proto_parser as proto_parser
-from acts_contrib.test_utils.instrumentation import instrumentation_text_output_parser
-from acts_contrib.test_utils.instrumentation.config_wrapper import ContextualConfigWrapper
-from acts_contrib.test_utils.instrumentation.device.command.adb_command_types import GenericCommand
-from acts_contrib.test_utils.instrumentation.device.command.instrumentation_command_builder import DEFAULT_INSTRUMENTATION_LOG_OUTPUT
+from acts.test_utils.instrumentation import instrumentation_proto_parser as proto_parser
+from acts.test_utils.instrumentation import instrumentation_text_output_parser
+from acts.test_utils.instrumentation.config_wrapper import ContextualConfigWrapper
+from acts.test_utils.instrumentation.device.command.adb_command_types import GenericCommand
+from acts.test_utils.instrumentation.device.command.instrumentation_command_builder import DEFAULT_INSTRUMENTATION_LOG_OUTPUT
RESOLVE_FILE_MARKER = 'FILE'
FILE_NOT_FOUND = 'File is missing from ACTS config'
diff --git a/acts_tests/acts_contrib/test_utils/instrumentation/instrumentation_proto_parser.py b/acts/framework/acts/test_utils/instrumentation/instrumentation_proto_parser.py
similarity index 98%
rename from acts_tests/acts_contrib/test_utils/instrumentation/instrumentation_proto_parser.py
rename to acts/framework/acts/test_utils/instrumentation/instrumentation_proto_parser.py
index 8b50fb8..40a78fe 100644
--- a/acts_tests/acts_contrib/test_utils/instrumentation/instrumentation_proto_parser.py
+++ b/acts/framework/acts/test_utils/instrumentation/instrumentation_proto_parser.py
@@ -19,7 +19,7 @@
import tempfile
from acts.error import ActsError
-from acts_contrib.test_utils.instrumentation.proto.gen import instrumentation_data_pb2
+from acts.test_utils.instrumentation.proto.gen import instrumentation_data_pb2
DEFAULT_INST_LOG_DIR = 'instrument-logs'
diff --git a/acts_tests/acts_contrib/test_utils/instrumentation/instrumentation_text_output_parser.py b/acts/framework/acts/test_utils/instrumentation/instrumentation_text_output_parser.py
similarity index 96%
rename from acts_tests/acts_contrib/test_utils/instrumentation/instrumentation_text_output_parser.py
rename to acts/framework/acts/test_utils/instrumentation/instrumentation_text_output_parser.py
index cced3ac..e17b721 100644
--- a/acts_tests/acts_contrib/test_utils/instrumentation/instrumentation_text_output_parser.py
+++ b/acts/framework/acts/test_utils/instrumentation/instrumentation_text_output_parser.py
@@ -18,8 +18,8 @@
import re
from acts.error import ActsError
-from acts_contrib.test_utils.instrumentation.device.command.instrumentation_command_builder import DEFAULT_INSTRUMENTATION_LOG_OUTPUT
-from acts_contrib.test_utils.instrumentation.proto.gen import instrumentation_data_pb2
+from acts.test_utils.instrumentation.device.command.instrumentation_command_builder import DEFAULT_INSTRUMENTATION_LOG_OUTPUT
+from acts.test_utils.instrumentation.proto.gen import instrumentation_data_pb2
class InstrumentationOutputError(ActsError):
diff --git a/acts_tests/acts_contrib/test_utils/instrumentation/power/__init__.py b/acts/framework/acts/test_utils/instrumentation/power/__init__.py
similarity index 100%
rename from acts_tests/acts_contrib/test_utils/instrumentation/power/__init__.py
rename to acts/framework/acts/test_utils/instrumentation/power/__init__.py
diff --git a/acts_tests/acts_contrib/test_utils/instrumentation/power/apollo/ApolloBaseTest.py b/acts/framework/acts/test_utils/instrumentation/power/apollo/ApolloBaseTest.py
similarity index 96%
rename from acts_tests/acts_contrib/test_utils/instrumentation/power/apollo/ApolloBaseTest.py
rename to acts/framework/acts/test_utils/instrumentation/power/apollo/ApolloBaseTest.py
index 751579a..b99dfe9 100644
--- a/acts_tests/acts_contrib/test_utils/instrumentation/power/apollo/ApolloBaseTest.py
+++ b/acts/framework/acts/test_utils/instrumentation/power/apollo/ApolloBaseTest.py
@@ -1,5 +1,5 @@
-from acts_contrib.test_utils.instrumentation.device.apps.app_installer import AppInstaller
-from acts_contrib.test_utils.instrumentation.power import instrumentation_power_test
+from acts.test_utils.instrumentation.device.apps.app_installer import AppInstaller
+from acts.test_utils.instrumentation.power import instrumentation_power_test
import time
diff --git a/acts_tests/acts_contrib/test_utils/instrumentation/power/apollo/__init__.py b/acts/framework/acts/test_utils/instrumentation/power/apollo/__init__.py
similarity index 100%
rename from acts_tests/acts_contrib/test_utils/instrumentation/power/apollo/__init__.py
rename to acts/framework/acts/test_utils/instrumentation/power/apollo/__init__.py
diff --git a/acts_tests/acts_contrib/test_utils/instrumentation/power/data_graph/README.txt b/acts/framework/acts/test_utils/instrumentation/power/data_graph/README.txt
similarity index 100%
rename from acts_tests/acts_contrib/test_utils/instrumentation/power/data_graph/README.txt
rename to acts/framework/acts/test_utils/instrumentation/power/data_graph/README.txt
diff --git a/acts_tests/acts_contrib/test_utils/instrumentation/power/data_graph/power_audio_chart.py b/acts/framework/acts/test_utils/instrumentation/power/data_graph/power_audio_chart.py
similarity index 87%
rename from acts_tests/acts_contrib/test_utils/instrumentation/power/data_graph/power_audio_chart.py
rename to acts/framework/acts/test_utils/instrumentation/power/data_graph/power_audio_chart.py
index 0b7dbf9..baaf4fd 100644
--- a/acts_tests/acts_contrib/test_utils/instrumentation/power/data_graph/power_audio_chart.py
+++ b/acts/framework/acts/test_utils/instrumentation/power/data_graph/power_audio_chart.py
@@ -1,9 +1,9 @@
import mimetypes
import os
-from acts_contrib.test_utils.instrumentation.power.data_graph.utils import CSV_Monsoon_Reader
-from acts_contrib.test_utils.instrumentation.power.data_graph.utils import ACTS_Monsoon_Reader
-from acts_contrib.test_utils.instrumentation.power.data_graph.utils import CSV_PCM_Reader
+from acts.test_utils.instrumentation.power.data_graph.utils import CSV_Monsoon_Reader
+from acts.test_utils.instrumentation.power.data_graph.utils import ACTS_Monsoon_Reader
+from acts.test_utils.instrumentation.power.data_graph.utils import CSV_PCM_Reader
def generate_chart(input_file, output_file, template_file):
diff --git a/acts_tests/acts_contrib/test_utils/instrumentation/power/data_graph/template.html b/acts/framework/acts/test_utils/instrumentation/power/data_graph/template.html
similarity index 100%
rename from acts_tests/acts_contrib/test_utils/instrumentation/power/data_graph/template.html
rename to acts/framework/acts/test_utils/instrumentation/power/data_graph/template.html
diff --git a/acts_tests/acts_contrib/test_utils/instrumentation/power/data_graph/utils.py b/acts/framework/acts/test_utils/instrumentation/power/data_graph/utils.py
similarity index 100%
rename from acts_tests/acts_contrib/test_utils/instrumentation/power/data_graph/utils.py
rename to acts/framework/acts/test_utils/instrumentation/power/data_graph/utils.py
diff --git a/acts_tests/acts_contrib/test_utils/instrumentation/power/instrumentation_power_test.py b/acts/framework/acts/test_utils/instrumentation/power/instrumentation_power_test.py
similarity index 95%
rename from acts_tests/acts_contrib/test_utils/instrumentation/power/instrumentation_power_test.py
rename to acts/framework/acts/test_utils/instrumentation/power/instrumentation_power_test.py
index 4d97fa5..bcad9fd 100644
--- a/acts_tests/acts_contrib/test_utils/instrumentation/power/instrumentation_power_test.py
+++ b/acts/framework/acts/test_utils/instrumentation/power/instrumentation_power_test.py
@@ -29,19 +29,19 @@
from acts.controllers.android_lib.errors import AndroidDeviceError
from acts.metrics.loggers.blackbox import BlackboxMappedMetricLogger
from acts.metrics.loggers.bounded_metrics import BoundedMetricsLogger
-from acts_contrib.test_utils.instrumentation import instrumentation_proto_parser as proto_parser
-from acts_contrib.test_utils.instrumentation.device.apps.app_installer import AppInstaller
-from acts_contrib.test_utils.instrumentation.device.apps.google_apps_test_utils import GoogleAppsTestUtils
-from acts_contrib.test_utils.instrumentation.device.apps.permissions import PermissionsUtil
-from acts_contrib.test_utils.instrumentation.device.command.adb_commands import common
-from acts_contrib.test_utils.instrumentation.device.command.adb_commands import goog
-from acts_contrib.test_utils.instrumentation.device.command.instrumentation_command_builder import DEFAULT_INSTRUMENTATION_LOG_OUTPUT
-from acts_contrib.test_utils.instrumentation.device.command.instrumentation_command_builder import InstrumentationTestCommandBuilder
-from acts_contrib.test_utils.instrumentation.instrumentation_base_test import InstrumentationBaseTest
-from acts_contrib.test_utils.instrumentation.instrumentation_base_test import InstrumentationTestError
-from acts_contrib.test_utils.instrumentation.instrumentation_proto_parser import DEFAULT_INST_LOG_DIR
-from acts_contrib.test_utils.instrumentation.power.data_graph import power_audio_chart
-from acts_contrib.test_utils.instrumentation.power.thresholds import AbsoluteThresholds
+from acts.test_utils.instrumentation import instrumentation_proto_parser as proto_parser
+from acts.test_utils.instrumentation.device.apps.app_installer import AppInstaller
+from acts.test_utils.instrumentation.device.apps.google_apps_test_utils import GoogleAppsTestUtils
+from acts.test_utils.instrumentation.device.apps.permissions import PermissionsUtil
+from acts.test_utils.instrumentation.device.command.adb_commands import common
+from acts.test_utils.instrumentation.device.command.adb_commands import goog
+from acts.test_utils.instrumentation.device.command.instrumentation_command_builder import DEFAULT_INSTRUMENTATION_LOG_OUTPUT
+from acts.test_utils.instrumentation.device.command.instrumentation_command_builder import InstrumentationTestCommandBuilder
+from acts.test_utils.instrumentation.instrumentation_base_test import InstrumentationBaseTest
+from acts.test_utils.instrumentation.instrumentation_base_test import InstrumentationTestError
+from acts.test_utils.instrumentation.instrumentation_proto_parser import DEFAULT_INST_LOG_DIR
+from acts.test_utils.instrumentation.power.data_graph import power_audio_chart
+from acts.test_utils.instrumentation.power.thresholds import AbsoluteThresholds
ACCEPTANCE_THRESHOLD = 'acceptance_threshold'
DEFAULT_DEVICE_STABILIZATION_TIME = 300
diff --git a/acts_tests/acts_contrib/test_utils/instrumentation/power/thresholds.py b/acts/framework/acts/test_utils/instrumentation/power/thresholds.py
similarity index 100%
rename from acts_tests/acts_contrib/test_utils/instrumentation/power/thresholds.py
rename to acts/framework/acts/test_utils/instrumentation/power/thresholds.py
diff --git a/acts_tests/acts_contrib/test_utils/instrumentation/power/vzw_dou_automation/__init__.py b/acts/framework/acts/test_utils/instrumentation/power/vzw_dou_automation/__init__.py
similarity index 100%
rename from acts_tests/acts_contrib/test_utils/instrumentation/power/vzw_dou_automation/__init__.py
rename to acts/framework/acts/test_utils/instrumentation/power/vzw_dou_automation/__init__.py
diff --git a/acts_tests/acts_contrib/test_utils/instrumentation/power/vzw_dou_automation/vzw_dou_automation_base_test.py b/acts/framework/acts/test_utils/instrumentation/power/vzw_dou_automation/vzw_dou_automation_base_test.py
similarity index 96%
rename from acts_tests/acts_contrib/test_utils/instrumentation/power/vzw_dou_automation/vzw_dou_automation_base_test.py
rename to acts/framework/acts/test_utils/instrumentation/power/vzw_dou_automation/vzw_dou_automation_base_test.py
index 0974461..001b298 100644
--- a/acts_tests/acts_contrib/test_utils/instrumentation/power/vzw_dou_automation/vzw_dou_automation_base_test.py
+++ b/acts/framework/acts/test_utils/instrumentation/power/vzw_dou_automation/vzw_dou_automation_base_test.py
@@ -23,11 +23,11 @@
from acts import signals
from acts.controllers.android_device import SL4A_APK_NAME
-from acts_contrib.test_utils.instrumentation.power import instrumentation_power_test
-from acts_contrib.test_utils.instrumentation.device.command.adb_commands import common
-from acts_contrib.test_utils.instrumentation.device.command.adb_commands import goog
-from acts_contrib.test_utils.instrumentation.device.apps.app_installer import AppInstaller
-from acts_contrib.test_utils.instrumentation.instrumentation_base_test import InstrumentationTestError
+from acts.test_utils.instrumentation.power import instrumentation_power_test
+from acts.test_utils.instrumentation.device.command.adb_commands import common
+from acts.test_utils.instrumentation.device.command.adb_commands import goog
+from acts.test_utils.instrumentation.device.apps.app_installer import AppInstaller
+from acts.test_utils.instrumentation.instrumentation_base_test import InstrumentationTestError
from acts.controllers import power_metrics
from enum import Enum
diff --git a/acts_tests/acts_contrib/test_utils/instrumentation/power/vzw_dou_automation/vzw_dou_automation_comp_base_test.py b/acts/framework/acts/test_utils/instrumentation/power/vzw_dou_automation/vzw_dou_automation_comp_base_test.py
similarity index 93%
rename from acts_tests/acts_contrib/test_utils/instrumentation/power/vzw_dou_automation/vzw_dou_automation_comp_base_test.py
rename to acts/framework/acts/test_utils/instrumentation/power/vzw_dou_automation/vzw_dou_automation_comp_base_test.py
index b23d6a9..40ca48a 100644
--- a/acts_tests/acts_contrib/test_utils/instrumentation/power/vzw_dou_automation/vzw_dou_automation_comp_base_test.py
+++ b/acts/framework/acts/test_utils/instrumentation/power/vzw_dou_automation/vzw_dou_automation_comp_base_test.py
@@ -17,19 +17,19 @@
import os
import time
-from acts_contrib.test_utils.instrumentation.device.apps.app_installer import AppInstaller
-from acts_contrib.test_utils.instrumentation.device.apps.permissions import PermissionsUtil
-from acts_contrib.test_utils.instrumentation.device.command.adb_commands import common
-from acts_contrib.test_utils.instrumentation.device.command.adb_commands import goog
-from acts_contrib.test_utils.instrumentation.device.command.instrumentation_command_builder import \
+from acts.test_utils.instrumentation.device.apps.app_installer import AppInstaller
+from acts.test_utils.instrumentation.device.apps.permissions import PermissionsUtil
+from acts.test_utils.instrumentation.device.command.adb_commands import common
+from acts.test_utils.instrumentation.device.command.adb_commands import goog
+from acts.test_utils.instrumentation.device.command.instrumentation_command_builder import \
DEFAULT_INSTRUMENTATION_LOG_OUTPUT
-from acts_contrib.test_utils.instrumentation.device.command.instrumentation_command_builder import \
+from acts.test_utils.instrumentation.device.command.instrumentation_command_builder import \
InstrumentationTestCommandBuilder
-from acts_contrib.test_utils.instrumentation.instrumentation_base_test import \
+from acts.test_utils.instrumentation.instrumentation_base_test import \
InstrumentationTestError
-from acts_contrib.test_utils.instrumentation.instrumentation_proto_parser import \
+from acts.test_utils.instrumentation.instrumentation_proto_parser import \
DEFAULT_INST_LOG_DIR
-from acts_contrib.test_utils.instrumentation.power.vzw_dou_automation import \
+from acts.test_utils.instrumentation.power.vzw_dou_automation import \
vzw_dou_automation_base_test
AUTOTESTER_LOG = 'autotester.log'
diff --git a/acts_tests/acts_contrib/test_utils/instrumentation/power/vzwdou/__init__.py b/acts/framework/acts/test_utils/instrumentation/power/vzwdou/__init__.py
similarity index 100%
rename from acts_tests/acts_contrib/test_utils/instrumentation/power/vzwdou/__init__.py
rename to acts/framework/acts/test_utils/instrumentation/power/vzwdou/__init__.py
diff --git a/acts_tests/acts_contrib/test_utils/instrumentation/power/vzwdou/vzw_dou_base_test.py b/acts/framework/acts/test_utils/instrumentation/power/vzwdou/vzw_dou_base_test.py
similarity index 86%
rename from acts_tests/acts_contrib/test_utils/instrumentation/power/vzwdou/vzw_dou_base_test.py
rename to acts/framework/acts/test_utils/instrumentation/power/vzwdou/vzw_dou_base_test.py
index 9ab84dd..e49dcd2 100644
--- a/acts_tests/acts_contrib/test_utils/instrumentation/power/vzwdou/vzw_dou_base_test.py
+++ b/acts/framework/acts/test_utils/instrumentation/power/vzwdou/vzw_dou_base_test.py
@@ -15,14 +15,14 @@
# limitations under the License.
import time
-from acts_contrib.test_utils.instrumentation.power import instrumentation_power_test
-from acts_contrib.test_utils.instrumentation.device.command.adb_commands import common
-from acts_contrib.test_utils.instrumentation.device.command.adb_commands import goog
-from acts_contrib.test_utils.instrumentation.device.command.adb_command_types import \
+from acts.test_utils.instrumentation.power import instrumentation_power_test
+from acts.test_utils.instrumentation.device.command.adb_commands import common
+from acts.test_utils.instrumentation.device.command.adb_commands import goog
+from acts.test_utils.instrumentation.device.command.adb_command_types import \
DeviceGServices
-from acts_contrib.test_utils.instrumentation.device.apps.google_account_util import \
+from acts.test_utils.instrumentation.device.apps.google_account_util import \
GoogleAccountUtil
-from acts_contrib.test_utils.instrumentation.device.apps.modem_diag_util import \
+from acts.test_utils.instrumentation.device.apps.modem_diag_util import \
ModemDiagUtil
class VzwDoUBaseTest(
diff --git a/acts_tests/acts_contrib/test_utils/instrumentation/proto/__init__.py b/acts/framework/acts/test_utils/instrumentation/proto/__init__.py
similarity index 100%
rename from acts_tests/acts_contrib/test_utils/instrumentation/proto/__init__.py
rename to acts/framework/acts/test_utils/instrumentation/proto/__init__.py
diff --git a/acts_tests/acts_contrib/test_utils/instrumentation/proto/gen/__init__.py b/acts/framework/acts/test_utils/instrumentation/proto/gen/__init__.py
similarity index 100%
rename from acts_tests/acts_contrib/test_utils/instrumentation/proto/gen/__init__.py
rename to acts/framework/acts/test_utils/instrumentation/proto/gen/__init__.py
diff --git a/acts_tests/acts_contrib/test_utils/instrumentation/proto/gen/instrumentation_data_pb2.py b/acts/framework/acts/test_utils/instrumentation/proto/gen/instrumentation_data_pb2.py
similarity index 70%
rename from acts_tests/acts_contrib/test_utils/instrumentation/proto/gen/instrumentation_data_pb2.py
rename to acts/framework/acts/test_utils/instrumentation/proto/gen/instrumentation_data_pb2.py
index 71c9f9c..0438501 100644
--- a/acts_tests/acts_contrib/test_utils/instrumentation/proto/gen/instrumentation_data_pb2.py
+++ b/acts/framework/acts/test_utils/instrumentation/proto/gen/instrumentation_data_pb2.py
@@ -1,7 +1,8 @@
-# -*- coding: utf-8 -*-
# Generated by the protocol buffer compiler. DO NOT EDIT!
# source: instrumentation_data.proto
-"""Generated protocol buffer code."""
+
+import sys
+_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1'))
from google.protobuf.internal import enum_type_wrapper
from google.protobuf import descriptor as _descriptor
from google.protobuf import message as _message
@@ -18,9 +19,8 @@
name='instrumentation_data.proto',
package='android.am',
syntax='proto2',
- serialized_options=b'\n\027com.android.commands.am',
- create_key=_descriptor._internal_create_key,
- serialized_pb=b'\n\x1ainstrumentation_data.proto\x12\nandroid.am\"\xcf\x01\n\x12ResultsBundleEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x14\n\x0cvalue_string\x18\x02 \x01(\t\x12\x11\n\tvalue_int\x18\x03 \x01(\x11\x12\x13\n\x0bvalue_float\x18\x04 \x01(\x02\x12\x14\n\x0cvalue_double\x18\x05 \x01(\x01\x12\x12\n\nvalue_long\x18\x06 \x01(\x12\x12/\n\x0cvalue_bundle\x18\x07 \x01(\x0b\x32\x19.android.am.ResultsBundle\x12\x13\n\x0bvalue_bytes\x18\x08 \x01(\x0c\"@\n\rResultsBundle\x12/\n\x07\x65ntries\x18\x01 \x03(\x0b\x32\x1e.android.am.ResultsBundleEntry\"]\n\nTestStatus\x12\x13\n\x0bresult_code\x18\x03 \x01(\x11\x12*\n\x07results\x18\x04 \x01(\x0b\x32\x19.android.am.ResultsBundle\x12\x0e\n\x06logcat\x18\x05 \x01(\t\"\x98\x01\n\rSessionStatus\x12\x32\n\x0bstatus_code\x18\x01 \x01(\x0e\x32\x1d.android.am.SessionStatusCode\x12\x12\n\nerror_text\x18\x02 \x01(\t\x12\x13\n\x0bresult_code\x18\x03 \x01(\x11\x12*\n\x07results\x18\x04 \x01(\x0b\x32\x19.android.am.ResultsBundle\"i\n\x07Session\x12+\n\x0btest_status\x18\x01 \x03(\x0b\x32\x16.android.am.TestStatus\x12\x31\n\x0esession_status\x18\x02 \x01(\x0b\x32\x19.android.am.SessionStatus*>\n\x11SessionStatusCode\x12\x14\n\x10SESSION_FINISHED\x10\x00\x12\x13\n\x0fSESSION_ABORTED\x10\x01\x42\x19\n\x17\x63om.android.commands.am'
+ serialized_options=_b('\n\027com.android.commands.am'),
+ serialized_pb=_b('\n\x1ainstrumentation_data.proto\x12\nandroid.am\"\xcf\x01\n\x12ResultsBundleEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x14\n\x0cvalue_string\x18\x02 \x01(\t\x12\x11\n\tvalue_int\x18\x03 \x01(\x11\x12\x13\n\x0bvalue_float\x18\x04 \x01(\x02\x12\x14\n\x0cvalue_double\x18\x05 \x01(\x01\x12\x12\n\nvalue_long\x18\x06 \x01(\x12\x12/\n\x0cvalue_bundle\x18\x07 \x01(\x0b\x32\x19.android.am.ResultsBundle\x12\x13\n\x0bvalue_bytes\x18\x08 \x01(\x0c\"@\n\rResultsBundle\x12/\n\x07\x65ntries\x18\x01 \x03(\x0b\x32\x1e.android.am.ResultsBundleEntry\"]\n\nTestStatus\x12\x13\n\x0bresult_code\x18\x03 \x01(\x11\x12*\n\x07results\x18\x04 \x01(\x0b\x32\x19.android.am.ResultsBundle\x12\x0e\n\x06logcat\x18\x05 \x01(\t\"\x98\x01\n\rSessionStatus\x12\x32\n\x0bstatus_code\x18\x01 \x01(\x0e\x32\x1d.android.am.SessionStatusCode\x12\x12\n\nerror_text\x18\x02 \x01(\t\x12\x13\n\x0bresult_code\x18\x03 \x01(\x11\x12*\n\x07results\x18\x04 \x01(\x0b\x32\x19.android.am.ResultsBundle\"i\n\x07Session\x12+\n\x0btest_status\x18\x01 \x03(\x0b\x32\x16.android.am.TestStatus\x12\x31\n\x0esession_status\x18\x02 \x01(\x0b\x32\x19.android.am.SessionStatus*>\n\x11SessionStatusCode\x12\x14\n\x10SESSION_FINISHED\x10\x00\x12\x13\n\x0fSESSION_ABORTED\x10\x01\x42\x19\n\x17\x63om.android.commands.am')
)
_SESSIONSTATUSCODE = _descriptor.EnumDescriptor(
@@ -28,18 +28,15 @@
full_name='android.am.SessionStatusCode',
filename=None,
file=DESCRIPTOR,
- create_key=_descriptor._internal_create_key,
values=[
_descriptor.EnumValueDescriptor(
name='SESSION_FINISHED', index=0, number=0,
serialized_options=None,
- type=None,
- create_key=_descriptor._internal_create_key),
+ type=None),
_descriptor.EnumValueDescriptor(
name='SESSION_ABORTED', index=1, number=1,
serialized_options=None,
- type=None,
- create_key=_descriptor._internal_create_key),
+ type=None),
],
containing_type=None,
serialized_options=None,
@@ -60,64 +57,63 @@
filename=None,
file=DESCRIPTOR,
containing_type=None,
- create_key=_descriptor._internal_create_key,
fields=[
_descriptor.FieldDescriptor(
name='key', full_name='android.am.ResultsBundleEntry.key', index=0,
number=1, type=9, cpp_type=9, label=1,
- has_default_value=False, default_value=b"".decode('utf-8'),
+ has_default_value=False, default_value=_b("").decode('utf-8'),
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ serialized_options=None, file=DESCRIPTOR),
_descriptor.FieldDescriptor(
name='value_string', full_name='android.am.ResultsBundleEntry.value_string', index=1,
number=2, type=9, cpp_type=9, label=1,
- has_default_value=False, default_value=b"".decode('utf-8'),
+ has_default_value=False, default_value=_b("").decode('utf-8'),
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ serialized_options=None, file=DESCRIPTOR),
_descriptor.FieldDescriptor(
name='value_int', full_name='android.am.ResultsBundleEntry.value_int', index=2,
number=3, type=17, cpp_type=1, label=1,
has_default_value=False, default_value=0,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ serialized_options=None, file=DESCRIPTOR),
_descriptor.FieldDescriptor(
name='value_float', full_name='android.am.ResultsBundleEntry.value_float', index=3,
number=4, type=2, cpp_type=6, label=1,
has_default_value=False, default_value=float(0),
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ serialized_options=None, file=DESCRIPTOR),
_descriptor.FieldDescriptor(
name='value_double', full_name='android.am.ResultsBundleEntry.value_double', index=4,
number=5, type=1, cpp_type=5, label=1,
has_default_value=False, default_value=float(0),
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ serialized_options=None, file=DESCRIPTOR),
_descriptor.FieldDescriptor(
name='value_long', full_name='android.am.ResultsBundleEntry.value_long', index=5,
number=6, type=18, cpp_type=2, label=1,
has_default_value=False, default_value=0,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ serialized_options=None, file=DESCRIPTOR),
_descriptor.FieldDescriptor(
name='value_bundle', full_name='android.am.ResultsBundleEntry.value_bundle', index=6,
number=7, type=11, cpp_type=10, label=1,
has_default_value=False, default_value=None,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ serialized_options=None, file=DESCRIPTOR),
_descriptor.FieldDescriptor(
name='value_bytes', full_name='android.am.ResultsBundleEntry.value_bytes', index=7,
number=8, type=12, cpp_type=9, label=1,
- has_default_value=False, default_value=b"",
+ has_default_value=False, default_value=_b(""),
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ serialized_options=None, file=DESCRIPTOR),
],
extensions=[
],
@@ -141,7 +137,6 @@
filename=None,
file=DESCRIPTOR,
containing_type=None,
- create_key=_descriptor._internal_create_key,
fields=[
_descriptor.FieldDescriptor(
name='entries', full_name='android.am.ResultsBundle.entries', index=0,
@@ -149,7 +144,7 @@
has_default_value=False, default_value=[],
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ serialized_options=None, file=DESCRIPTOR),
],
extensions=[
],
@@ -173,7 +168,6 @@
filename=None,
file=DESCRIPTOR,
containing_type=None,
- create_key=_descriptor._internal_create_key,
fields=[
_descriptor.FieldDescriptor(
name='result_code', full_name='android.am.TestStatus.result_code', index=0,
@@ -181,21 +175,21 @@
has_default_value=False, default_value=0,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ serialized_options=None, file=DESCRIPTOR),
_descriptor.FieldDescriptor(
name='results', full_name='android.am.TestStatus.results', index=1,
number=4, type=11, cpp_type=10, label=1,
has_default_value=False, default_value=None,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ serialized_options=None, file=DESCRIPTOR),
_descriptor.FieldDescriptor(
name='logcat', full_name='android.am.TestStatus.logcat', index=2,
number=5, type=9, cpp_type=9, label=1,
- has_default_value=False, default_value=b"".decode('utf-8'),
+ has_default_value=False, default_value=_b("").decode('utf-8'),
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ serialized_options=None, file=DESCRIPTOR),
],
extensions=[
],
@@ -219,7 +213,6 @@
filename=None,
file=DESCRIPTOR,
containing_type=None,
- create_key=_descriptor._internal_create_key,
fields=[
_descriptor.FieldDescriptor(
name='status_code', full_name='android.am.SessionStatus.status_code', index=0,
@@ -227,28 +220,28 @@
has_default_value=False, default_value=0,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ serialized_options=None, file=DESCRIPTOR),
_descriptor.FieldDescriptor(
name='error_text', full_name='android.am.SessionStatus.error_text', index=1,
number=2, type=9, cpp_type=9, label=1,
- has_default_value=False, default_value=b"".decode('utf-8'),
+ has_default_value=False, default_value=_b("").decode('utf-8'),
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ serialized_options=None, file=DESCRIPTOR),
_descriptor.FieldDescriptor(
name='result_code', full_name='android.am.SessionStatus.result_code', index=2,
number=3, type=17, cpp_type=1, label=1,
has_default_value=False, default_value=0,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ serialized_options=None, file=DESCRIPTOR),
_descriptor.FieldDescriptor(
name='results', full_name='android.am.SessionStatus.results', index=3,
number=4, type=11, cpp_type=10, label=1,
has_default_value=False, default_value=None,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ serialized_options=None, file=DESCRIPTOR),
],
extensions=[
],
@@ -272,7 +265,6 @@
filename=None,
file=DESCRIPTOR,
containing_type=None,
- create_key=_descriptor._internal_create_key,
fields=[
_descriptor.FieldDescriptor(
name='test_status', full_name='android.am.Session.test_status', index=0,
@@ -280,14 +272,14 @@
has_default_value=False, default_value=[],
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ serialized_options=None, file=DESCRIPTOR),
_descriptor.FieldDescriptor(
name='session_status', full_name='android.am.Session.session_status', index=1,
number=2, type=11, cpp_type=10, label=1,
has_default_value=False, default_value=None,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ serialized_options=None, file=DESCRIPTOR),
],
extensions=[
],
@@ -319,39 +311,39 @@
DESCRIPTOR.enum_types_by_name['SessionStatusCode'] = _SESSIONSTATUSCODE
_sym_db.RegisterFileDescriptor(DESCRIPTOR)
-ResultsBundleEntry = _reflection.GeneratedProtocolMessageType('ResultsBundleEntry', (_message.Message,), {
- 'DESCRIPTOR' : _RESULTSBUNDLEENTRY,
- '__module__' : 'instrumentation_data_pb2'
+ResultsBundleEntry = _reflection.GeneratedProtocolMessageType('ResultsBundleEntry', (_message.Message,), dict(
+ DESCRIPTOR = _RESULTSBUNDLEENTRY,
+ __module__ = 'instrumentation_data_pb2'
# @@protoc_insertion_point(class_scope:android.am.ResultsBundleEntry)
- })
+ ))
_sym_db.RegisterMessage(ResultsBundleEntry)
-ResultsBundle = _reflection.GeneratedProtocolMessageType('ResultsBundle', (_message.Message,), {
- 'DESCRIPTOR' : _RESULTSBUNDLE,
- '__module__' : 'instrumentation_data_pb2'
+ResultsBundle = _reflection.GeneratedProtocolMessageType('ResultsBundle', (_message.Message,), dict(
+ DESCRIPTOR = _RESULTSBUNDLE,
+ __module__ = 'instrumentation_data_pb2'
# @@protoc_insertion_point(class_scope:android.am.ResultsBundle)
- })
+ ))
_sym_db.RegisterMessage(ResultsBundle)
-TestStatus = _reflection.GeneratedProtocolMessageType('TestStatus', (_message.Message,), {
- 'DESCRIPTOR' : _TESTSTATUS,
- '__module__' : 'instrumentation_data_pb2'
+TestStatus = _reflection.GeneratedProtocolMessageType('TestStatus', (_message.Message,), dict(
+ DESCRIPTOR = _TESTSTATUS,
+ __module__ = 'instrumentation_data_pb2'
# @@protoc_insertion_point(class_scope:android.am.TestStatus)
- })
+ ))
_sym_db.RegisterMessage(TestStatus)
-SessionStatus = _reflection.GeneratedProtocolMessageType('SessionStatus', (_message.Message,), {
- 'DESCRIPTOR' : _SESSIONSTATUS,
- '__module__' : 'instrumentation_data_pb2'
+SessionStatus = _reflection.GeneratedProtocolMessageType('SessionStatus', (_message.Message,), dict(
+ DESCRIPTOR = _SESSIONSTATUS,
+ __module__ = 'instrumentation_data_pb2'
# @@protoc_insertion_point(class_scope:android.am.SessionStatus)
- })
+ ))
_sym_db.RegisterMessage(SessionStatus)
-Session = _reflection.GeneratedProtocolMessageType('Session', (_message.Message,), {
- 'DESCRIPTOR' : _SESSION,
- '__module__' : 'instrumentation_data_pb2'
+Session = _reflection.GeneratedProtocolMessageType('Session', (_message.Message,), dict(
+ DESCRIPTOR = _SESSION,
+ __module__ = 'instrumentation_data_pb2'
# @@protoc_insertion_point(class_scope:android.am.Session)
- })
+ ))
_sym_db.RegisterMessage(Session)
diff --git a/acts_tests/acts_contrib/test_utils/instrumentation/proto/instrumentation_data.proto b/acts/framework/acts/test_utils/instrumentation/proto/instrumentation_data.proto
similarity index 100%
rename from acts_tests/acts_contrib/test_utils/instrumentation/proto/instrumentation_data.proto
rename to acts/framework/acts/test_utils/instrumentation/proto/instrumentation_data.proto
diff --git a/acts_tests/acts_contrib/test_utils/net/NetstackBaseTest.py b/acts/framework/acts/test_utils/net/NetstackBaseTest.py
similarity index 100%
rename from acts_tests/acts_contrib/test_utils/net/NetstackBaseTest.py
rename to acts/framework/acts/test_utils/net/NetstackBaseTest.py
diff --git a/acts_tests/acts_contrib/test_utils/net/__init__.py b/acts/framework/acts/test_utils/net/__init__.py
similarity index 100%
rename from acts_tests/acts_contrib/test_utils/net/__init__.py
rename to acts/framework/acts/test_utils/net/__init__.py
diff --git a/acts_tests/acts_contrib/test_utils/net/arduino_test_utils.py b/acts/framework/acts/test_utils/net/arduino_test_utils.py
similarity index 92%
rename from acts_tests/acts_contrib/test_utils/net/arduino_test_utils.py
rename to acts/framework/acts/test_utils/net/arduino_test_utils.py
index 595512c..058d143 100644
--- a/acts_tests/acts_contrib/test_utils/net/arduino_test_utils.py
+++ b/acts/framework/acts/test_utils/net/arduino_test_utils.py
@@ -25,9 +25,9 @@
from acts import signals
from acts import utils
from acts.controllers import attenuator
-from acts_contrib.test_utils.wifi import wifi_constants
-from acts_contrib.test_utils.tel import tel_defines
-from acts_contrib.test_utils.wifi import wifi_test_utils as wutils
+from acts.test_utils.wifi import wifi_constants
+from acts.test_utils.tel import tel_defines
+from acts.test_utils.wifi import wifi_test_utils as wutils
ARDUINO = "/root/arduino/arduino-1.8.5/arduino "
CONNECT_WIFI = "/arduino/connect_wifi/connect_wifi.ino"
diff --git a/acts_tests/acts_contrib/test_utils/net/connectivity_const.py b/acts/framework/acts/test_utils/net/connectivity_const.py
similarity index 100%
rename from acts_tests/acts_contrib/test_utils/net/connectivity_const.py
rename to acts/framework/acts/test_utils/net/connectivity_const.py
diff --git a/acts_tests/acts_contrib/test_utils/net/connectivity_test_utils.py b/acts/framework/acts/test_utils/net/connectivity_test_utils.py
similarity index 98%
rename from acts_tests/acts_contrib/test_utils/net/connectivity_test_utils.py
rename to acts/framework/acts/test_utils/net/connectivity_test_utils.py
index d35fe04..153630f 100644
--- a/acts_tests/acts_contrib/test_utils/net/connectivity_test_utils.py
+++ b/acts/framework/acts/test_utils/net/connectivity_test_utils.py
@@ -14,7 +14,7 @@
# limitations under the License.
from acts import asserts
-from acts_contrib.test_utils.net import connectivity_const as cconst
+from acts.test_utils.net import connectivity_const as cconst
from queue import Empty
def _listen_for_keepalive_event(ad, key, msg, ka_event):
diff --git a/acts_tests/acts_contrib/test_utils/net/ipsec_test_utils.py b/acts/framework/acts/test_utils/net/ipsec_test_utils.py
similarity index 98%
rename from acts_tests/acts_contrib/test_utils/net/ipsec_test_utils.py
rename to acts/framework/acts/test_utils/net/ipsec_test_utils.py
index 5f383ee..ff31ea0 100644
--- a/acts_tests/acts_contrib/test_utils/net/ipsec_test_utils.py
+++ b/acts/framework/acts/test_utils/net/ipsec_test_utils.py
@@ -20,7 +20,7 @@
import threading
import time
-from acts_contrib.test_utils.net import connectivity_const as cconst
+from acts.test_utils.net import connectivity_const as cconst
from acts import asserts
PKTS = 5
diff --git a/acts_tests/acts_contrib/test_utils/net/net_test_utils.py b/acts/framework/acts/test_utils/net/net_test_utils.py
similarity index 97%
rename from acts_tests/acts_contrib/test_utils/net/net_test_utils.py
rename to acts/framework/acts/test_utils/net/net_test_utils.py
index 7c5e111..f094cc4 100644
--- a/acts_tests/acts_contrib/test_utils/net/net_test_utils.py
+++ b/acts/framework/acts/test_utils/net/net_test_utils.py
@@ -23,11 +23,11 @@
from acts.controllers.adb_lib.error import AdbError
from acts.utils import start_standing_subprocess
from acts.utils import stop_standing_subprocess
-from acts_contrib.test_utils.net import connectivity_const as cconst
-from acts_contrib.test_utils.tel.tel_test_utils import get_operator_name
-from acts_contrib.test_utils.tel.tel_data_utils import wait_for_cell_data_connection
-from acts_contrib.test_utils.tel.tel_test_utils import verify_http_connection
-from acts_contrib.test_utils.wifi import wifi_test_utils as wutils
+from acts.test_utils.net import connectivity_const as cconst
+from acts.test_utils.tel.tel_test_utils import get_operator_name
+from acts.test_utils.tel.tel_data_utils import wait_for_cell_data_connection
+from acts.test_utils.tel.tel_test_utils import verify_http_connection
+from acts.test_utils.wifi import wifi_test_utils as wutils
from scapy.all import get_if_list
import os
diff --git a/acts_tests/acts_contrib/test_utils/net/nsd_const.py b/acts/framework/acts/test_utils/net/nsd_const.py
similarity index 100%
rename from acts_tests/acts_contrib/test_utils/net/nsd_const.py
rename to acts/framework/acts/test_utils/net/nsd_const.py
diff --git a/acts_tests/acts_contrib/test_utils/net/socket_test_utils.py b/acts/framework/acts/test_utils/net/socket_test_utils.py
similarity index 98%
rename from acts_tests/acts_contrib/test_utils/net/socket_test_utils.py
rename to acts/framework/acts/test_utils/net/socket_test_utils.py
index b9a6bdf..42e4537 100644
--- a/acts_tests/acts_contrib/test_utils/net/socket_test_utils.py
+++ b/acts/framework/acts/test_utils/net/socket_test_utils.py
@@ -18,7 +18,7 @@
import threading
import time
-from acts_contrib.test_utils.net import connectivity_const as cconst
+from acts.test_utils.net import connectivity_const as cconst
from acts import asserts
MSG = "Test message "
diff --git a/acts_tests/acts_contrib/test_utils/net/ui_utils.py b/acts/framework/acts/test_utils/net/ui_utils.py
similarity index 100%
rename from acts_tests/acts_contrib/test_utils/net/ui_utils.py
rename to acts/framework/acts/test_utils/net/ui_utils.py
diff --git a/acts_tests/acts_contrib/test_utils/power/IperfHelper.py b/acts/framework/acts/test_utils/power/IperfHelper.py
similarity index 100%
rename from acts_tests/acts_contrib/test_utils/power/IperfHelper.py
rename to acts/framework/acts/test_utils/power/IperfHelper.py
diff --git a/acts_tests/acts_contrib/test_utils/power/PowerBTBaseTest.py b/acts/framework/acts/test_utils/power/PowerBTBaseTest.py
similarity index 93%
rename from acts_tests/acts_contrib/test_utils/power/PowerBTBaseTest.py
rename to acts/framework/acts/test_utils/power/PowerBTBaseTest.py
index 056787c..3ea3d80 100644
--- a/acts_tests/acts_contrib/test_utils/power/PowerBTBaseTest.py
+++ b/acts/framework/acts/test_utils/power/PowerBTBaseTest.py
@@ -16,10 +16,10 @@
import os
import time
-import acts_contrib.test_utils.bt.bt_power_test_utils as btputils
-import acts_contrib.test_utils.bt.bt_test_utils as btutils
-import acts_contrib.test_utils.power.PowerBaseTest as PBT
-from acts_contrib.test_utils.abstract_devices.bluetooth_handsfree_abstract_device import BluetoothHandsfreeAbstractDeviceFactory as bt_factory
+import acts.test_utils.bt.bt_power_test_utils as btputils
+import acts.test_utils.bt.bt_test_utils as btutils
+import acts.test_utils.power.PowerBaseTest as PBT
+from acts.test_utils.abstract_devices.bluetooth_handsfree_abstract_device import BluetoothHandsfreeAbstractDeviceFactory as bt_factory
from math import copysign
BLE_LOCATION_SCAN_DISABLE = 'settings put secure location_mode 0'
diff --git a/acts_tests/acts_contrib/test_utils/power/PowerBaseTest.py b/acts/framework/acts/test_utils/power/PowerBaseTest.py
similarity index 98%
rename from acts_tests/acts_contrib/test_utils/power/PowerBaseTest.py
rename to acts/framework/acts/test_utils/power/PowerBaseTest.py
index 0419290..32d7301 100644
--- a/acts_tests/acts_contrib/test_utils/power/PowerBaseTest.py
+++ b/acts/framework/acts/test_utils/power/PowerBaseTest.py
@@ -26,9 +26,9 @@
from acts import base_test
from acts import utils
from acts.metrics.loggers.blackbox import BlackboxMetricLogger
-from acts_contrib.test_utils.power.loggers.power_metric_logger import PowerMetricLogger
-from acts_contrib.test_utils.power import plot_utils
-from acts_contrib.test_utils.wifi import wifi_test_utils as wutils
+from acts.test_utils.power.loggers.power_metric_logger import PowerMetricLogger
+from acts.test_utils.power import plot_utils
+from acts.test_utils.wifi import wifi_test_utils as wutils
RESET_BATTERY_STATS = 'dumpsys batterystats --reset'
IPERF_TIMEOUT = 180
diff --git a/acts_tests/acts_contrib/test_utils/power/PowerCoexBaseTest.py b/acts/framework/acts/test_utils/power/PowerCoexBaseTest.py
similarity index 93%
rename from acts_tests/acts_contrib/test_utils/power/PowerCoexBaseTest.py
rename to acts/framework/acts/test_utils/power/PowerCoexBaseTest.py
index 8142f82..d278ca8 100644
--- a/acts_tests/acts_contrib/test_utils/power/PowerCoexBaseTest.py
+++ b/acts/framework/acts/test_utils/power/PowerCoexBaseTest.py
@@ -14,10 +14,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-import acts_contrib.test_utils.power.PowerBTBaseTest as PBtBT
-import acts_contrib.test_utils.power.PowerWiFiBaseTest as PWBT
+import acts.test_utils.power.PowerBTBaseTest as PBtBT
+import acts.test_utils.power.PowerWiFiBaseTest as PWBT
from acts import utils
-from acts_contrib.test_utils.wifi import wifi_test_utils as wutils
+from acts.test_utils.wifi import wifi_test_utils as wutils
class PowerCoexBaseTest(PBtBT.PowerBTBaseTest, PWBT.PowerWiFiBaseTest):
diff --git a/acts_tests/acts_contrib/test_utils/power/PowerGTWGnssBaseTest.py b/acts/framework/acts/test_utils/power/PowerGTWGnssBaseTest.py
similarity index 95%
rename from acts_tests/acts_contrib/test_utils/power/PowerGTWGnssBaseTest.py
rename to acts/framework/acts/test_utils/power/PowerGTWGnssBaseTest.py
index 63c59db..6525365 100644
--- a/acts_tests/acts_contrib/test_utils/power/PowerGTWGnssBaseTest.py
+++ b/acts/framework/acts/test_utils/power/PowerGTWGnssBaseTest.py
@@ -17,9 +17,9 @@
from acts import signals
from acts import utils
-from acts_contrib.test_utils.power.PowerBaseTest import PowerBaseTest
-from acts_contrib.test_utils.gnss import gnss_test_utils as gutils
-from acts_contrib.test_utils.wifi import wifi_test_utils as wutils
+from acts.test_utils.power.PowerBaseTest import PowerBaseTest
+from acts.test_utils.gnss import gnss_test_utils as gutils
+from acts.test_utils.wifi import wifi_test_utils as wutils
DEFAULT_WAIT_TIME = 120
STANDALONE_WAIT_TIME = 1200
diff --git a/acts_tests/acts_contrib/test_utils/power/PowerGnssBaseTest.py b/acts/framework/acts/test_utils/power/PowerGnssBaseTest.py
similarity index 98%
rename from acts_tests/acts_contrib/test_utils/power/PowerGnssBaseTest.py
rename to acts/framework/acts/test_utils/power/PowerGnssBaseTest.py
index 37b9e56..c90b723 100644
--- a/acts_tests/acts_contrib/test_utils/power/PowerGnssBaseTest.py
+++ b/acts/framework/acts/test_utils/power/PowerGnssBaseTest.py
@@ -19,7 +19,7 @@
import os
-import acts_contrib.test_utils.power.PowerBaseTest as PBT
+import acts.test_utils.power.PowerBaseTest as PBT
from acts import base_test
from acts.controllers import monsoon
diff --git a/acts_tests/acts_contrib/test_utils/power/PowerWiFiBaseTest.py b/acts/framework/acts/test_utils/power/PowerWiFiBaseTest.py
similarity index 95%
rename from acts_tests/acts_contrib/test_utils/power/PowerWiFiBaseTest.py
rename to acts/framework/acts/test_utils/power/PowerWiFiBaseTest.py
index 7ca573e..0654c02 100644
--- a/acts_tests/acts_contrib/test_utils/power/PowerWiFiBaseTest.py
+++ b/acts/framework/acts/test_utils/power/PowerWiFiBaseTest.py
@@ -14,10 +14,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-import acts_contrib.test_utils.power.PowerBaseTest as PBT
-from acts_contrib.test_utils.wifi import wifi_test_utils as wutils
-from acts_contrib.test_utils.wifi import wifi_power_test_utils as wputils
-from acts_contrib.test_utils.power import plot_utils
+import acts.test_utils.power.PowerBaseTest as PBT
+from acts.test_utils.wifi import wifi_test_utils as wutils
+from acts.test_utils.wifi import wifi_power_test_utils as wputils
+from acts.test_utils.power import plot_utils
IPERF_DURATION = 'iperf_duration'
INITIAL_ATTEN = [0, 0, 90, 90]
diff --git a/acts_tests/acts_contrib/test_utils/power/__init__.py b/acts/framework/acts/test_utils/power/__init__.py
similarity index 100%
rename from acts_tests/acts_contrib/test_utils/power/__init__.py
rename to acts/framework/acts/test_utils/power/__init__.py
diff --git a/acts_tests/acts_contrib/test_utils/power/cellular/__init__.py b/acts/framework/acts/test_utils/power/cellular/__init__.py
similarity index 100%
rename from acts_tests/acts_contrib/test_utils/power/cellular/__init__.py
rename to acts/framework/acts/test_utils/power/cellular/__init__.py
diff --git a/acts_tests/acts_contrib/test_utils/power/cellular/cellular_hotspot_traffic_power_test.py b/acts/framework/acts/test_utils/power/cellular/cellular_hotspot_traffic_power_test.py
similarity index 94%
rename from acts_tests/acts_contrib/test_utils/power/cellular/cellular_hotspot_traffic_power_test.py
rename to acts/framework/acts/test_utils/power/cellular/cellular_hotspot_traffic_power_test.py
index a4c2df6..2c55080 100644
--- a/acts_tests/acts_contrib/test_utils/power/cellular/cellular_hotspot_traffic_power_test.py
+++ b/acts/framework/acts/test_utils/power/cellular/cellular_hotspot_traffic_power_test.py
@@ -15,10 +15,10 @@
# limitations under the License.
import time
-from acts_contrib.test_utils.tel.tel_test_utils import WIFI_CONFIG_APBAND_2G
-from acts_contrib.test_utils.tel.tel_test_utils import WIFI_CONFIG_APBAND_5G
-from acts_contrib.test_utils.wifi import wifi_test_utils as wutils
-import acts_contrib.test_utils.power.cellular.cellular_traffic_power_test as ctpt
+from acts.test_utils.tel.tel_test_utils import WIFI_CONFIG_APBAND_2G
+from acts.test_utils.tel.tel_test_utils import WIFI_CONFIG_APBAND_5G
+from acts.test_utils.wifi import wifi_test_utils as wutils
+import acts.test_utils.power.cellular.cellular_traffic_power_test as ctpt
class PowerTelHotspotTest(ctpt.PowerTelTrafficTest):
diff --git a/acts_tests/acts_contrib/test_utils/power/cellular/cellular_idle_power_test.py b/acts/framework/acts/test_utils/power/cellular/cellular_idle_power_test.py
similarity index 97%
rename from acts_tests/acts_contrib/test_utils/power/cellular/cellular_idle_power_test.py
rename to acts/framework/acts/test_utils/power/cellular/cellular_idle_power_test.py
index 72cb7ee..a4652e6 100644
--- a/acts_tests/acts_contrib/test_utils/power/cellular/cellular_idle_power_test.py
+++ b/acts/framework/acts/test_utils/power/cellular/cellular_idle_power_test.py
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-import acts_contrib.test_utils.power.cellular.cellular_power_base_test as PWCEL
+import acts.test_utils.power.cellular.cellular_power_base_test as PWCEL
class PowerTelIdleTest(PWCEL.PowerCellularLabBaseTest):
diff --git a/acts_tests/acts_contrib/test_utils/power/cellular/cellular_pdcch_power_test.py b/acts/framework/acts/test_utils/power/cellular/cellular_pdcch_power_test.py
similarity index 93%
rename from acts_tests/acts_contrib/test_utils/power/cellular/cellular_pdcch_power_test.py
rename to acts/framework/acts/test_utils/power/cellular/cellular_pdcch_power_test.py
index c071c5a..0a4e8d7 100644
--- a/acts_tests/acts_contrib/test_utils/power/cellular/cellular_pdcch_power_test.py
+++ b/acts/framework/acts/test_utils/power/cellular/cellular_pdcch_power_test.py
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-import acts_contrib.test_utils.power.cellular.cellular_power_base_test as base_test
+import acts.test_utils.power.cellular.cellular_power_base_test as base_test
class PowerTelPDCCHTest(base_test.PowerCellularLabBaseTest):
diff --git a/acts_tests/acts_contrib/test_utils/power/cellular/cellular_power_base_test.py b/acts/framework/acts/test_utils/power/cellular/cellular_power_base_test.py
similarity index 98%
rename from acts_tests/acts_contrib/test_utils/power/cellular/cellular_power_base_test.py
rename to acts/framework/acts/test_utils/power/cellular/cellular_power_base_test.py
index adc49b7..6986bbd 100644
--- a/acts_tests/acts_contrib/test_utils/power/cellular/cellular_power_base_test.py
+++ b/acts/framework/acts/test_utils/power/cellular/cellular_power_base_test.py
@@ -16,7 +16,7 @@
import time
import os
-import acts_contrib.test_utils.power.PowerBaseTest as PBT
+import acts.test_utils.power.PowerBaseTest as PBT
import acts.controllers.cellular_simulator as simulator
from acts.controllers.anritsu_lib import md8475_cellular_simulator as anritsu
from acts.controllers.rohdeschwarz_lib import cmw500_cellular_simulator as cmw
@@ -27,8 +27,8 @@
from acts.controllers.cellular_lib import UmtsSimulation
from acts.controllers.cellular_lib import LteCaSimulation
from acts.controllers.cellular_lib import LteImsSimulation
-from acts_contrib.test_utils.tel import tel_test_utils as telutils
-from acts_contrib.test_utils.power import plot_utils
+from acts.test_utils.tel import tel_test_utils as telutils
+from acts.test_utils.power import plot_utils
class PowerCellularLabBaseTest(PBT.PowerBaseTest):
diff --git a/acts_tests/acts_contrib/test_utils/power/cellular/cellular_traffic_power_test.py b/acts/framework/acts/test_utils/power/cellular/cellular_traffic_power_test.py
similarity index 98%
rename from acts_tests/acts_contrib/test_utils/power/cellular/cellular_traffic_power_test.py
rename to acts/framework/acts/test_utils/power/cellular/cellular_traffic_power_test.py
index 21e3dcf..012b1dc 100644
--- a/acts_tests/acts_contrib/test_utils/power/cellular/cellular_traffic_power_test.py
+++ b/acts/framework/acts/test_utils/power/cellular/cellular_traffic_power_test.py
@@ -21,10 +21,10 @@
from acts import asserts
from acts import utils
from acts.metrics.loggers.blackbox import BlackboxMetricLogger
-from acts_contrib.test_utils.power import IperfHelper as IPH
-from acts_contrib.test_utils.power import plot_utils
-import acts_contrib.test_utils.power.cellular.cellular_power_base_test as PWCEL
-from acts_contrib.test_utils.tel import tel_test_utils as telutils
+from acts.test_utils.power import IperfHelper as IPH
+from acts.test_utils.power import plot_utils
+import acts.test_utils.power.cellular.cellular_power_base_test as PWCEL
+from acts.test_utils.tel import tel_test_utils as telutils
class PowerTelTrafficTest(PWCEL.PowerCellularLabBaseTest):
diff --git a/acts_tests/acts_contrib/test_utils/power/cellular/cellular_voice_call_power_test.py b/acts/framework/acts/test_utils/power/cellular/cellular_voice_call_power_test.py
similarity index 92%
rename from acts_tests/acts_contrib/test_utils/power/cellular/cellular_voice_call_power_test.py
rename to acts/framework/acts/test_utils/power/cellular/cellular_voice_call_power_test.py
index 802d8cc..8d4f9f5 100644
--- a/acts_tests/acts_contrib/test_utils/power/cellular/cellular_voice_call_power_test.py
+++ b/acts/framework/acts/test_utils/power/cellular/cellular_voice_call_power_test.py
@@ -18,8 +18,8 @@
from acts.controllers.anritsu_lib.md8475a import VirtualPhoneAutoAnswer
-import acts_contrib.test_utils.power.cellular.cellular_power_base_test as PWCEL
-from acts_contrib.test_utils.tel.tel_test_utils import initiate_call, hangup_call, set_phone_silent_mode
+import acts.test_utils.power.cellular.cellular_power_base_test as PWCEL
+from acts.test_utils.tel.tel_test_utils import initiate_call, hangup_call, set_phone_silent_mode
class PowerTelVoiceCallTest(PWCEL.PowerCellularLabBaseTest):
diff --git a/acts_tests/acts_contrib/test_utils/power/cellular/cellular_volte_power_test.py b/acts/framework/acts/test_utils/power/cellular/cellular_volte_power_test.py
similarity index 89%
rename from acts_tests/acts_contrib/test_utils/power/cellular/cellular_volte_power_test.py
rename to acts/framework/acts/test_utils/power/cellular/cellular_volte_power_test.py
index 986878d..1ed29b0f 100644
--- a/acts_tests/acts_contrib/test_utils/power/cellular/cellular_volte_power_test.py
+++ b/acts/framework/acts/test_utils/power/cellular/cellular_volte_power_test.py
@@ -16,11 +16,11 @@
import time
-import acts_contrib.test_utils.tel.anritsu_utils as anritsu_utils
+import acts.test_utils.tel.anritsu_utils as anritsu_utils
import acts.controllers.anritsu_lib.md8475a as md8475a
-import acts_contrib.test_utils.power.cellular.cellular_power_base_test as PWCEL
-from acts_contrib.test_utils.tel.tel_test_utils import initiate_call, hangup_call, set_phone_silent_mode
+import acts.test_utils.power.cellular.cellular_power_base_test as PWCEL
+from acts.test_utils.tel.tel_test_utils import initiate_call, hangup_call, set_phone_silent_mode
class PowerTelVoLTECallTest(PWCEL.PowerCellularLabBaseTest):
diff --git a/acts_tests/acts_contrib/test_utils/power/loggers/__init__.py b/acts/framework/acts/test_utils/power/loggers/__init__.py
similarity index 100%
rename from acts_tests/acts_contrib/test_utils/power/loggers/__init__.py
rename to acts/framework/acts/test_utils/power/loggers/__init__.py
diff --git a/acts_tests/acts_contrib/test_utils/power/loggers/power_metric_logger.py b/acts/framework/acts/test_utils/power/loggers/power_metric_logger.py
similarity index 96%
rename from acts_tests/acts_contrib/test_utils/power/loggers/power_metric_logger.py
rename to acts/framework/acts/test_utils/power/loggers/power_metric_logger.py
index 89deb5c..824f9b5 100644
--- a/acts_tests/acts_contrib/test_utils/power/loggers/power_metric_logger.py
+++ b/acts/framework/acts/test_utils/power/loggers/power_metric_logger.py
@@ -15,7 +15,7 @@
# the License.
import os
-import acts_contrib.test_utils.power.loggers.protos.power_metric_pb2 as power_protos
+import acts.test_utils.power.loggers.protos.power_metric_pb2 as power_protos
from acts.metrics.core import ProtoMetric
from acts.metrics.logger import MetricLogger
diff --git a/acts_tests/acts_contrib/test_utils/power/loggers/protos/__init__.py b/acts/framework/acts/test_utils/power/loggers/protos/__init__.py
similarity index 100%
rename from acts_tests/acts_contrib/test_utils/power/loggers/protos/__init__.py
rename to acts/framework/acts/test_utils/power/loggers/protos/__init__.py
diff --git a/acts_tests/acts_contrib/test_utils/power/loggers/protos/power_metric.proto b/acts/framework/acts/test_utils/power/loggers/protos/power_metric.proto
similarity index 100%
rename from acts_tests/acts_contrib/test_utils/power/loggers/protos/power_metric.proto
rename to acts/framework/acts/test_utils/power/loggers/protos/power_metric.proto
diff --git a/acts_tests/acts_contrib/test_utils/power/loggers/protos/power_metric_pb2.py b/acts/framework/acts/test_utils/power/loggers/protos/power_metric_pb2.py
similarity index 69%
rename from acts_tests/acts_contrib/test_utils/power/loggers/protos/power_metric_pb2.py
rename to acts/framework/acts/test_utils/power/loggers/protos/power_metric_pb2.py
index d1682cc..f9b2a50 100644
--- a/acts_tests/acts_contrib/test_utils/power/loggers/protos/power_metric_pb2.py
+++ b/acts/framework/acts/test_utils/power/loggers/protos/power_metric_pb2.py
@@ -1,7 +1,8 @@
-# -*- coding: utf-8 -*-
# Generated by the protocol buffer compiler. DO NOT EDIT!
# source: power_metric.proto
-"""Generated protocol buffer code."""
+
+import sys
+_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1'))
from google.protobuf import descriptor as _descriptor
from google.protobuf import message as _message
from google.protobuf import reflection as _reflection
@@ -18,8 +19,7 @@
package='wireless.android.platform.testing.power.metrics',
syntax='proto2',
serialized_options=None,
- create_key=_descriptor._internal_create_key,
- serialized_pb=b'\n\x12power_metric.proto\x12/wireless.android.platform.testing.power.metrics\"\x80\x03\n\x0bPowerMetric\x12\x11\n\tavg_power\x18\x01 \x01(\x02\x12\x0f\n\x07testbed\x18\x02 \x01(\t\x12]\n\x0f\x63\x65llular_metric\x18\x03 \x01(\x0b\x32\x44.wireless.android.platform.testing.power.metrics.PowerCellularMetric\x12\x0e\n\x06\x62ranch\x18\x04 \x01(\t\x12\x10\n\x08\x62uild_id\x18\x05 \x01(\t\x12\x0e\n\x06target\x18\x06 \x01(\t\x12\x13\n\x0b\x61vg_current\x18\x07 \x01(\x02\x12\x0f\n\x07voltage\x18\x08 \x01(\x02\x12\x1f\n\x17test_suite_display_name\x18\t \x01(\t\x12\x1e\n\x16test_case_display_name\x18\n \x01(\t\x12\x1c\n\x14incremental_build_id\x18\x0b \x01(\t\x12\x1d\n\x15\x61vg_current_threshold\x18\x0c \x01(\x02\x12\x18\n\x10pass_fail_status\x18\r \x01(\t\"}\n\x13PowerCellularMetric\x12\x13\n\x0b\x61vg_dl_tput\x18\x01 \x01(\x02\x12\x13\n\x0b\x61vg_ul_tput\x18\x02 \x01(\x02\x12\x1d\n\x15\x61vg_dl_tput_threshold\x18\x03 \x01(\x02\x12\x1d\n\x15\x61vg_ul_tput_threshold\x18\x04 \x01(\x02'
+ serialized_pb=_b('\n\x12power_metric.proto\x12/wireless.android.platform.testing.power.metrics\"\x80\x03\n\x0bPowerMetric\x12\x11\n\tavg_power\x18\x01 \x01(\x02\x12\x0f\n\x07testbed\x18\x02 \x01(\t\x12]\n\x0f\x63\x65llular_metric\x18\x03 \x01(\x0b\x32\x44.wireless.android.platform.testing.power.metrics.PowerCellularMetric\x12\x0e\n\x06\x62ranch\x18\x04 \x01(\t\x12\x10\n\x08\x62uild_id\x18\x05 \x01(\t\x12\x0e\n\x06target\x18\x06 \x01(\t\x12\x13\n\x0b\x61vg_current\x18\x07 \x01(\x02\x12\x0f\n\x07voltage\x18\x08 \x01(\x02\x12\x1f\n\x17test_suite_display_name\x18\t \x01(\t\x12\x1e\n\x16test_case_display_name\x18\n \x01(\t\x12\x1c\n\x14incremental_build_id\x18\x0b \x01(\t\x12\x1d\n\x15\x61vg_current_threshold\x18\x0c \x01(\x02\x12\x18\n\x10pass_fail_status\x18\r \x01(\t\"}\n\x13PowerCellularMetric\x12\x13\n\x0b\x61vg_dl_tput\x18\x01 \x01(\x02\x12\x13\n\x0b\x61vg_ul_tput\x18\x02 \x01(\x02\x12\x1d\n\x15\x61vg_dl_tput_threshold\x18\x03 \x01(\x02\x12\x1d\n\x15\x61vg_ul_tput_threshold\x18\x04 \x01(\x02')
)
@@ -31,7 +31,6 @@
filename=None,
file=DESCRIPTOR,
containing_type=None,
- create_key=_descriptor._internal_create_key,
fields=[
_descriptor.FieldDescriptor(
name='avg_power', full_name='wireless.android.platform.testing.power.metrics.PowerMetric.avg_power', index=0,
@@ -39,91 +38,91 @@
has_default_value=False, default_value=float(0),
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ serialized_options=None, file=DESCRIPTOR),
_descriptor.FieldDescriptor(
name='testbed', full_name='wireless.android.platform.testing.power.metrics.PowerMetric.testbed', index=1,
number=2, type=9, cpp_type=9, label=1,
- has_default_value=False, default_value=b"".decode('utf-8'),
+ has_default_value=False, default_value=_b("").decode('utf-8'),
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ serialized_options=None, file=DESCRIPTOR),
_descriptor.FieldDescriptor(
name='cellular_metric', full_name='wireless.android.platform.testing.power.metrics.PowerMetric.cellular_metric', index=2,
number=3, type=11, cpp_type=10, label=1,
has_default_value=False, default_value=None,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ serialized_options=None, file=DESCRIPTOR),
_descriptor.FieldDescriptor(
name='branch', full_name='wireless.android.platform.testing.power.metrics.PowerMetric.branch', index=3,
number=4, type=9, cpp_type=9, label=1,
- has_default_value=False, default_value=b"".decode('utf-8'),
+ has_default_value=False, default_value=_b("").decode('utf-8'),
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ serialized_options=None, file=DESCRIPTOR),
_descriptor.FieldDescriptor(
name='build_id', full_name='wireless.android.platform.testing.power.metrics.PowerMetric.build_id', index=4,
number=5, type=9, cpp_type=9, label=1,
- has_default_value=False, default_value=b"".decode('utf-8'),
+ has_default_value=False, default_value=_b("").decode('utf-8'),
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ serialized_options=None, file=DESCRIPTOR),
_descriptor.FieldDescriptor(
name='target', full_name='wireless.android.platform.testing.power.metrics.PowerMetric.target', index=5,
number=6, type=9, cpp_type=9, label=1,
- has_default_value=False, default_value=b"".decode('utf-8'),
+ has_default_value=False, default_value=_b("").decode('utf-8'),
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ serialized_options=None, file=DESCRIPTOR),
_descriptor.FieldDescriptor(
name='avg_current', full_name='wireless.android.platform.testing.power.metrics.PowerMetric.avg_current', index=6,
number=7, type=2, cpp_type=6, label=1,
has_default_value=False, default_value=float(0),
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ serialized_options=None, file=DESCRIPTOR),
_descriptor.FieldDescriptor(
name='voltage', full_name='wireless.android.platform.testing.power.metrics.PowerMetric.voltage', index=7,
number=8, type=2, cpp_type=6, label=1,
has_default_value=False, default_value=float(0),
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ serialized_options=None, file=DESCRIPTOR),
_descriptor.FieldDescriptor(
name='test_suite_display_name', full_name='wireless.android.platform.testing.power.metrics.PowerMetric.test_suite_display_name', index=8,
number=9, type=9, cpp_type=9, label=1,
- has_default_value=False, default_value=b"".decode('utf-8'),
+ has_default_value=False, default_value=_b("").decode('utf-8'),
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ serialized_options=None, file=DESCRIPTOR),
_descriptor.FieldDescriptor(
name='test_case_display_name', full_name='wireless.android.platform.testing.power.metrics.PowerMetric.test_case_display_name', index=9,
number=10, type=9, cpp_type=9, label=1,
- has_default_value=False, default_value=b"".decode('utf-8'),
+ has_default_value=False, default_value=_b("").decode('utf-8'),
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ serialized_options=None, file=DESCRIPTOR),
_descriptor.FieldDescriptor(
name='incremental_build_id', full_name='wireless.android.platform.testing.power.metrics.PowerMetric.incremental_build_id', index=10,
number=11, type=9, cpp_type=9, label=1,
- has_default_value=False, default_value=b"".decode('utf-8'),
+ has_default_value=False, default_value=_b("").decode('utf-8'),
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ serialized_options=None, file=DESCRIPTOR),
_descriptor.FieldDescriptor(
name='avg_current_threshold', full_name='wireless.android.platform.testing.power.metrics.PowerMetric.avg_current_threshold', index=11,
number=12, type=2, cpp_type=6, label=1,
has_default_value=False, default_value=float(0),
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ serialized_options=None, file=DESCRIPTOR),
_descriptor.FieldDescriptor(
name='pass_fail_status', full_name='wireless.android.platform.testing.power.metrics.PowerMetric.pass_fail_status', index=12,
number=13, type=9, cpp_type=9, label=1,
- has_default_value=False, default_value=b"".decode('utf-8'),
+ has_default_value=False, default_value=_b("").decode('utf-8'),
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ serialized_options=None, file=DESCRIPTOR),
],
extensions=[
],
@@ -147,7 +146,6 @@
filename=None,
file=DESCRIPTOR,
containing_type=None,
- create_key=_descriptor._internal_create_key,
fields=[
_descriptor.FieldDescriptor(
name='avg_dl_tput', full_name='wireless.android.platform.testing.power.metrics.PowerCellularMetric.avg_dl_tput', index=0,
@@ -155,28 +153,28 @@
has_default_value=False, default_value=float(0),
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ serialized_options=None, file=DESCRIPTOR),
_descriptor.FieldDescriptor(
name='avg_ul_tput', full_name='wireless.android.platform.testing.power.metrics.PowerCellularMetric.avg_ul_tput', index=1,
number=2, type=2, cpp_type=6, label=1,
has_default_value=False, default_value=float(0),
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ serialized_options=None, file=DESCRIPTOR),
_descriptor.FieldDescriptor(
name='avg_dl_tput_threshold', full_name='wireless.android.platform.testing.power.metrics.PowerCellularMetric.avg_dl_tput_threshold', index=2,
number=3, type=2, cpp_type=6, label=1,
has_default_value=False, default_value=float(0),
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ serialized_options=None, file=DESCRIPTOR),
_descriptor.FieldDescriptor(
name='avg_ul_tput_threshold', full_name='wireless.android.platform.testing.power.metrics.PowerCellularMetric.avg_ul_tput_threshold', index=3,
number=4, type=2, cpp_type=6, label=1,
has_default_value=False, default_value=float(0),
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ serialized_options=None, file=DESCRIPTOR),
],
extensions=[
],
@@ -198,18 +196,18 @@
DESCRIPTOR.message_types_by_name['PowerCellularMetric'] = _POWERCELLULARMETRIC
_sym_db.RegisterFileDescriptor(DESCRIPTOR)
-PowerMetric = _reflection.GeneratedProtocolMessageType('PowerMetric', (_message.Message,), {
- 'DESCRIPTOR' : _POWERMETRIC,
- '__module__' : 'power_metric_pb2'
+PowerMetric = _reflection.GeneratedProtocolMessageType('PowerMetric', (_message.Message,), dict(
+ DESCRIPTOR = _POWERMETRIC,
+ __module__ = 'power_metric_pb2'
# @@protoc_insertion_point(class_scope:wireless.android.platform.testing.power.metrics.PowerMetric)
- })
+ ))
_sym_db.RegisterMessage(PowerMetric)
-PowerCellularMetric = _reflection.GeneratedProtocolMessageType('PowerCellularMetric', (_message.Message,), {
- 'DESCRIPTOR' : _POWERCELLULARMETRIC,
- '__module__' : 'power_metric_pb2'
+PowerCellularMetric = _reflection.GeneratedProtocolMessageType('PowerCellularMetric', (_message.Message,), dict(
+ DESCRIPTOR = _POWERCELLULARMETRIC,
+ __module__ = 'power_metric_pb2'
# @@protoc_insertion_point(class_scope:wireless.android.platform.testing.power.metrics.PowerCellularMetric)
- })
+ ))
_sym_db.RegisterMessage(PowerCellularMetric)
diff --git a/acts_tests/acts_contrib/test_utils/power/plot_utils.py b/acts/framework/acts/test_utils/power/plot_utils.py
similarity index 100%
rename from acts_tests/acts_contrib/test_utils/power/plot_utils.py
rename to acts/framework/acts/test_utils/power/plot_utils.py
diff --git a/acts_tests/acts_contrib/test_utils/tel/TelephonyBaseTest.py b/acts/framework/acts/test_utils/tel/TelephonyBaseTest.py
similarity index 84%
rename from acts_tests/acts_contrib/test_utils/tel/TelephonyBaseTest.py
rename to acts/framework/acts/test_utils/tel/TelephonyBaseTest.py
index d9f922c..dea7ba8 100644
--- a/acts_tests/acts_contrib/test_utils/tel/TelephonyBaseTest.py
+++ b/acts/framework/acts/test_utils/tel/TelephonyBaseTest.py
@@ -33,63 +33,63 @@
from acts import records
from acts import utils
-from acts_contrib.test_utils.tel.tel_subscription_utils import \
+from acts.test_utils.tel.tel_subscription_utils import \
initial_set_up_for_subid_infomation
-from acts_contrib.test_utils.tel.tel_subscription_utils import \
+from acts.test_utils.tel.tel_subscription_utils import \
set_default_sub_for_all_services
-from acts_contrib.test_utils.tel.tel_subscription_utils import get_subid_from_slot_index
-from acts_contrib.test_utils.tel.tel_test_utils import build_id_override
-from acts_contrib.test_utils.tel.tel_test_utils import disable_qxdm_logger
-from acts_contrib.test_utils.tel.tel_test_utils import enable_connectivity_metrics
-from acts_contrib.test_utils.tel.tel_test_utils import enable_radio_log_on
-from acts_contrib.test_utils.tel.tel_test_utils import ensure_phone_default_state
-from acts_contrib.test_utils.tel.tel_test_utils import ensure_phone_idle
-from acts_contrib.test_utils.tel.tel_test_utils import ensure_wifi_connected
-from acts_contrib.test_utils.tel.tel_test_utils import force_connectivity_metrics_upload
-from acts_contrib.test_utils.tel.tel_test_utils import get_operator_name
-from acts_contrib.test_utils.tel.tel_test_utils import get_screen_shot_log
-from acts_contrib.test_utils.tel.tel_test_utils import get_sim_state
-from acts_contrib.test_utils.tel.tel_test_utils import get_tcpdump_log
-from acts_contrib.test_utils.tel.tel_test_utils import multithread_func
-from acts_contrib.test_utils.tel.tel_test_utils import print_radio_info
-from acts_contrib.test_utils.tel.tel_test_utils import reboot_device
-from acts_contrib.test_utils.tel.tel_test_utils import recover_build_id
-from acts_contrib.test_utils.tel.tel_test_utils import run_multithread_func
-from acts_contrib.test_utils.tel.tel_test_utils import setup_droid_properties
-from acts_contrib.test_utils.tel.tel_test_utils import set_phone_screen_on
-from acts_contrib.test_utils.tel.tel_test_utils import set_phone_silent_mode
-from acts_contrib.test_utils.tel.tel_test_utils import set_qxdm_logger_command
-from acts_contrib.test_utils.tel.tel_test_utils import start_qxdm_logger
-from acts_contrib.test_utils.tel.tel_test_utils import start_qxdm_loggers
-from acts_contrib.test_utils.tel.tel_test_utils import start_sdm_loggers
-from acts_contrib.test_utils.tel.tel_test_utils import start_sdm_logger
-from acts_contrib.test_utils.tel.tel_test_utils import start_tcpdumps
-from acts_contrib.test_utils.tel.tel_test_utils import stop_qxdm_logger
-from acts_contrib.test_utils.tel.tel_test_utils import stop_sdm_loggers
-from acts_contrib.test_utils.tel.tel_test_utils import stop_sdm_logger
-from acts_contrib.test_utils.tel.tel_test_utils import stop_tcpdumps
-from acts_contrib.test_utils.tel.tel_test_utils import synchronize_device_time
-from acts_contrib.test_utils.tel.tel_test_utils import unlock_sim
-from acts_contrib.test_utils.tel.tel_test_utils import wait_for_sim_ready_by_adb
-from acts_contrib.test_utils.tel.tel_test_utils import wait_for_sims_ready_by_adb
-from acts_contrib.test_utils.tel.tel_test_utils import activate_wfc_on_device
-from acts_contrib.test_utils.tel.tel_test_utils import install_googleaccountutil_apk
-from acts_contrib.test_utils.tel.tel_test_utils import add_google_account
-from acts_contrib.test_utils.tel.tel_test_utils import install_googlefi_apk
-from acts_contrib.test_utils.tel.tel_test_utils import activate_google_fi_account
-from acts_contrib.test_utils.tel.tel_test_utils import check_google_fi_activated
-from acts_contrib.test_utils.tel.tel_test_utils import check_fi_apk_installed
-from acts_contrib.test_utils.tel.tel_test_utils import phone_switch_to_msim_mode
-from acts_contrib.test_utils.tel.tel_test_utils import activate_esim_using_suw
-from acts_contrib.test_utils.tel.tel_defines import PRECISE_CALL_STATE_LISTEN_LEVEL_BACKGROUND
-from acts_contrib.test_utils.tel.tel_defines import SINGLE_SIM_CONFIG, MULTI_SIM_CONFIG
-from acts_contrib.test_utils.tel.tel_defines import PRECISE_CALL_STATE_LISTEN_LEVEL_FOREGROUND
-from acts_contrib.test_utils.tel.tel_defines import PRECISE_CALL_STATE_LISTEN_LEVEL_RINGING
-from acts_contrib.test_utils.tel.tel_defines import SIM_STATE_ABSENT
-from acts_contrib.test_utils.tel.tel_defines import SIM_STATE_UNKNOWN
-from acts_contrib.test_utils.tel.tel_defines import WIFI_VERBOSE_LOGGING_ENABLED
-from acts_contrib.test_utils.tel.tel_defines import WIFI_VERBOSE_LOGGING_DISABLED
-from acts_contrib.test_utils.tel.tel_defines import INVALID_SUB_ID
+from acts.test_utils.tel.tel_subscription_utils import get_subid_from_slot_index
+from acts.test_utils.tel.tel_test_utils import build_id_override
+from acts.test_utils.tel.tel_test_utils import disable_qxdm_logger
+from acts.test_utils.tel.tel_test_utils import enable_connectivity_metrics
+from acts.test_utils.tel.tel_test_utils import enable_radio_log_on
+from acts.test_utils.tel.tel_test_utils import ensure_phone_default_state
+from acts.test_utils.tel.tel_test_utils import ensure_phone_idle
+from acts.test_utils.tel.tel_test_utils import ensure_wifi_connected
+from acts.test_utils.tel.tel_test_utils import force_connectivity_metrics_upload
+from acts.test_utils.tel.tel_test_utils import get_operator_name
+from acts.test_utils.tel.tel_test_utils import get_screen_shot_log
+from acts.test_utils.tel.tel_test_utils import get_sim_state
+from acts.test_utils.tel.tel_test_utils import get_tcpdump_log
+from acts.test_utils.tel.tel_test_utils import multithread_func
+from acts.test_utils.tel.tel_test_utils import print_radio_info
+from acts.test_utils.tel.tel_test_utils import reboot_device
+from acts.test_utils.tel.tel_test_utils import recover_build_id
+from acts.test_utils.tel.tel_test_utils import run_multithread_func
+from acts.test_utils.tel.tel_test_utils import setup_droid_properties
+from acts.test_utils.tel.tel_test_utils import set_phone_screen_on
+from acts.test_utils.tel.tel_test_utils import set_phone_silent_mode
+from acts.test_utils.tel.tel_test_utils import set_qxdm_logger_command
+from acts.test_utils.tel.tel_test_utils import start_qxdm_logger
+from acts.test_utils.tel.tel_test_utils import start_qxdm_loggers
+from acts.test_utils.tel.tel_test_utils import start_sdm_loggers
+from acts.test_utils.tel.tel_test_utils import start_sdm_logger
+from acts.test_utils.tel.tel_test_utils import start_tcpdumps
+from acts.test_utils.tel.tel_test_utils import stop_qxdm_logger
+from acts.test_utils.tel.tel_test_utils import stop_sdm_loggers
+from acts.test_utils.tel.tel_test_utils import stop_sdm_logger
+from acts.test_utils.tel.tel_test_utils import stop_tcpdumps
+from acts.test_utils.tel.tel_test_utils import synchronize_device_time
+from acts.test_utils.tel.tel_test_utils import unlock_sim
+from acts.test_utils.tel.tel_test_utils import wait_for_sim_ready_by_adb
+from acts.test_utils.tel.tel_test_utils import wait_for_sims_ready_by_adb
+from acts.test_utils.tel.tel_test_utils import activate_wfc_on_device
+from acts.test_utils.tel.tel_test_utils import install_googleaccountutil_apk
+from acts.test_utils.tel.tel_test_utils import add_google_account
+from acts.test_utils.tel.tel_test_utils import install_googlefi_apk
+from acts.test_utils.tel.tel_test_utils import activate_google_fi_account
+from acts.test_utils.tel.tel_test_utils import check_google_fi_activated
+from acts.test_utils.tel.tel_test_utils import check_fi_apk_installed
+from acts.test_utils.tel.tel_test_utils import phone_switch_to_msim_mode
+from acts.test_utils.tel.tel_test_utils import activate_esim_using_suw
+from acts.test_utils.tel.tel_defines import PRECISE_CALL_STATE_LISTEN_LEVEL_BACKGROUND
+from acts.test_utils.tel.tel_defines import SINGLE_SIM_CONFIG, MULTI_SIM_CONFIG
+from acts.test_utils.tel.tel_defines import PRECISE_CALL_STATE_LISTEN_LEVEL_FOREGROUND
+from acts.test_utils.tel.tel_defines import PRECISE_CALL_STATE_LISTEN_LEVEL_RINGING
+from acts.test_utils.tel.tel_defines import SIM_STATE_ABSENT
+from acts.test_utils.tel.tel_defines import SIM_STATE_UNKNOWN
+from acts.test_utils.tel.tel_defines import WIFI_VERBOSE_LOGGING_ENABLED
+from acts.test_utils.tel.tel_defines import WIFI_VERBOSE_LOGGING_DISABLED
+from acts.test_utils.tel.tel_defines import INVALID_SUB_ID
class TelephonyBaseTest(BaseTestClass):
diff --git a/acts_tests/acts_contrib/test_utils/tel/__init__.py b/acts/framework/acts/test_utils/tel/__init__.py
similarity index 100%
rename from acts_tests/acts_contrib/test_utils/tel/__init__.py
rename to acts/framework/acts/test_utils/tel/__init__.py
diff --git a/acts_tests/acts_contrib/test_utils/tel/anritsu_utils.py b/acts/framework/acts/test_utils/tel/anritsu_utils.py
similarity index 98%
rename from acts_tests/acts_contrib/test_utils/tel/anritsu_utils.py
rename to acts/framework/acts/test_utils/tel/anritsu_utils.py
index 04a9e35..882cfd6 100644
--- a/acts_tests/acts_contrib/test_utils/tel/anritsu_utils.py
+++ b/acts/framework/acts/test_utils/tel/anritsu_utils.py
@@ -35,23 +35,23 @@
from acts.controllers.anritsu_lib.md8475a import TestMeasurement
from acts.controllers.anritsu_lib.md8475a import Switch
from acts.controllers.anritsu_lib.md8475a import BtsPacketRate
-from acts_contrib.test_utils.tel.tel_defines import CALL_TEARDOWN_PHONE
-from acts_contrib.test_utils.tel.tel_defines import CALL_TEARDOWN_REMOTE
-from acts_contrib.test_utils.tel.tel_defines import MAX_WAIT_TIME_CALL_DROP
-from acts_contrib.test_utils.tel.tel_defines import RAT_1XRTT
-from acts_contrib.test_utils.tel.tel_defines import WAIT_TIME_IN_CALL
-from acts_contrib.test_utils.tel.tel_defines import WAIT_TIME_IN_CALL_LONG
-from acts_contrib.test_utils.tel.tel_defines import WAIT_TIME_IN_CALL_FOR_IMS
-from acts_contrib.test_utils.tel.tel_defines import EventCmasReceived
-from acts_contrib.test_utils.tel.tel_defines import EventEtwsReceived
-from acts_contrib.test_utils.tel.tel_defines import EventSmsDeliverSuccess
-from acts_contrib.test_utils.tel.tel_defines import EventSmsSentSuccess
-from acts_contrib.test_utils.tel.tel_defines import EventSmsReceived
-from acts_contrib.test_utils.tel.tel_test_utils import ensure_phone_idle
-from acts_contrib.test_utils.tel.tel_test_utils import hangup_call
-from acts_contrib.test_utils.tel.tel_test_utils import initiate_call
-from acts_contrib.test_utils.tel.tel_test_utils import wait_and_answer_call
-from acts_contrib.test_utils.tel.tel_test_utils import wait_for_droid_not_in_call
+from acts.test_utils.tel.tel_defines import CALL_TEARDOWN_PHONE
+from acts.test_utils.tel.tel_defines import CALL_TEARDOWN_REMOTE
+from acts.test_utils.tel.tel_defines import MAX_WAIT_TIME_CALL_DROP
+from acts.test_utils.tel.tel_defines import RAT_1XRTT
+from acts.test_utils.tel.tel_defines import WAIT_TIME_IN_CALL
+from acts.test_utils.tel.tel_defines import WAIT_TIME_IN_CALL_LONG
+from acts.test_utils.tel.tel_defines import WAIT_TIME_IN_CALL_FOR_IMS
+from acts.test_utils.tel.tel_defines import EventCmasReceived
+from acts.test_utils.tel.tel_defines import EventEtwsReceived
+from acts.test_utils.tel.tel_defines import EventSmsDeliverSuccess
+from acts.test_utils.tel.tel_defines import EventSmsSentSuccess
+from acts.test_utils.tel.tel_defines import EventSmsReceived
+from acts.test_utils.tel.tel_test_utils import ensure_phone_idle
+from acts.test_utils.tel.tel_test_utils import hangup_call
+from acts.test_utils.tel.tel_test_utils import initiate_call
+from acts.test_utils.tel.tel_test_utils import wait_and_answer_call
+from acts.test_utils.tel.tel_test_utils import wait_for_droid_not_in_call
# Timers
# Time to wait after registration before sending a command to Anritsu
diff --git a/acts_tests/acts_contrib/test_utils/tel/loggers/__init__.py b/acts/framework/acts/test_utils/tel/loggers/__init__.py
similarity index 100%
rename from acts_tests/acts_contrib/test_utils/tel/loggers/__init__.py
rename to acts/framework/acts/test_utils/tel/loggers/__init__.py
diff --git a/acts_tests/acts_contrib/test_utils/tel/loggers/protos/__init__.py b/acts/framework/acts/test_utils/tel/loggers/protos/__init__.py
similarity index 100%
rename from acts_tests/acts_contrib/test_utils/tel/loggers/protos/__init__.py
rename to acts/framework/acts/test_utils/tel/loggers/protos/__init__.py
diff --git a/acts_tests/acts_contrib/test_utils/tel/loggers/protos/telephony_metric.proto b/acts/framework/acts/test_utils/tel/loggers/protos/telephony_metric.proto
similarity index 100%
rename from acts_tests/acts_contrib/test_utils/tel/loggers/protos/telephony_metric.proto
rename to acts/framework/acts/test_utils/tel/loggers/protos/telephony_metric.proto
diff --git a/acts_tests/acts_contrib/test_utils/tel/loggers/protos/telephony_metric_pb2.py b/acts/framework/acts/test_utils/tel/loggers/protos/telephony_metric_pb2.py
similarity index 60%
rename from acts_tests/acts_contrib/test_utils/tel/loggers/protos/telephony_metric_pb2.py
rename to acts/framework/acts/test_utils/tel/loggers/protos/telephony_metric_pb2.py
index e191960..7a6c2ca 100644
--- a/acts_tests/acts_contrib/test_utils/tel/loggers/protos/telephony_metric_pb2.py
+++ b/acts/framework/acts/test_utils/tel/loggers/protos/telephony_metric_pb2.py
@@ -1,11 +1,13 @@
-# -*- coding: utf-8 -*-
# Generated by the protocol buffer compiler. DO NOT EDIT!
# source: telephony_metric.proto
-"""Generated protocol buffer code."""
+
+import sys
+_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1'))
from google.protobuf import descriptor as _descriptor
from google.protobuf import message as _message
from google.protobuf import reflection as _reflection
from google.protobuf import symbol_database as _symbol_database
+from google.protobuf import descriptor_pb2
# @@protoc_insertion_point(imports)
_sym_db = _symbol_database.Default()
@@ -17,9 +19,7 @@
name='telephony_metric.proto',
package='wireless.android.platform.testing.telephony.metrics',
syntax='proto2',
- serialized_options=None,
- create_key=_descriptor._internal_create_key,
- serialized_pb=b'\n\x16telephony_metric.proto\x12\x33wireless.android.platform.testing.telephony.metrics\"\xf6\x04\n\x18TelephonyVoiceTestResult\x12h\n\x06result\x18\x01 \x01(\x0e\x32X.wireless.android.platform.testing.telephony.metrics.TelephonyVoiceTestResult.CallResult\x12\x1f\n\x17\x63\x61ll_setup_time_latency\x18\x02 \x01(\x02\"\xce\x03\n\nCallResult\x12%\n\x18UNAVAILABLE_NETWORK_TYPE\x10\xfe\xff\xff\xff\xff\xff\xff\xff\xff\x01\x12\x1f\n\x12\x43\x41LL_SETUP_FAILURE\x10\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\x12\x0b\n\x07SUCCESS\x10\x00\x12\x13\n\x0fINITIATE_FAILED\x10\x01\x12\"\n\x1eNO_RING_EVENT_OR_ANSWER_FAILED\x10\x02\x12\x14\n\x10NO_CALL_ID_FOUND\x10\x03\x12.\n*CALL_STATE_NOT_ACTIVE_DURING_ESTABLISHMENT\x10\x04\x12/\n+AUDIO_STATE_NOT_INCALL_DURING_ESTABLISHMENT\x10\x05\x12*\n&AUDIO_STATE_NOT_INCALL_AFTER_CONNECTED\x10\x06\x12\x31\n-CALL_DROP_OR_WRONG_STATE_DURING_ESTABLISHMENT\x10\x07\x12,\n(CALL_DROP_OR_WRONG_STATE_AFTER_CONNECTED\x10\x08\x12\x14\n\x10\x43\x41LL_HANGUP_FAIL\x10\t\x12\x18\n\x14\x43\x41LL_ID_CLEANUP_FAIL\x10\n\"|\n\x1aTelephonyVoiceStressResult\x12^\n\x07results\x18\x01 \x03(\x0b\x32M.wireless.android.platform.testing.telephony.metrics.TelephonyVoiceTestResult'
+ serialized_pb=_b('\n\x16telephony_metric.proto\x12\x33wireless.android.platform.testing.telephony.metrics\"\xf6\x04\n\x18TelephonyVoiceTestResult\x12h\n\x06result\x18\x01 \x01(\x0e\x32X.wireless.android.platform.testing.telephony.metrics.TelephonyVoiceTestResult.CallResult\x12\x1f\n\x17\x63\x61ll_setup_time_latency\x18\x02 \x01(\x02\"\xce\x03\n\nCallResult\x12%\n\x18UNAVAILABLE_NETWORK_TYPE\x10\xfe\xff\xff\xff\xff\xff\xff\xff\xff\x01\x12\x1f\n\x12\x43\x41LL_SETUP_FAILURE\x10\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\x12\x0b\n\x07SUCCESS\x10\x00\x12\x13\n\x0fINITIATE_FAILED\x10\x01\x12\"\n\x1eNO_RING_EVENT_OR_ANSWER_FAILED\x10\x02\x12\x14\n\x10NO_CALL_ID_FOUND\x10\x03\x12.\n*CALL_STATE_NOT_ACTIVE_DURING_ESTABLISHMENT\x10\x04\x12/\n+AUDIO_STATE_NOT_INCALL_DURING_ESTABLISHMENT\x10\x05\x12*\n&AUDIO_STATE_NOT_INCALL_AFTER_CONNECTED\x10\x06\x12\x31\n-CALL_DROP_OR_WRONG_STATE_DURING_ESTABLISHMENT\x10\x07\x12,\n(CALL_DROP_OR_WRONG_STATE_AFTER_CONNECTED\x10\x08\x12\x14\n\x10\x43\x41LL_HANGUP_FAIL\x10\t\x12\x18\n\x14\x43\x41LL_ID_CLEANUP_FAIL\x10\n\"|\n\x1aTelephonyVoiceStressResult\x12^\n\x07results\x18\x01 \x03(\x0b\x32M.wireless.android.platform.testing.telephony.metrics.TelephonyVoiceTestResult')
)
@@ -29,76 +29,62 @@
full_name='wireless.android.platform.testing.telephony.metrics.TelephonyVoiceTestResult.CallResult',
filename=None,
file=DESCRIPTOR,
- create_key=_descriptor._internal_create_key,
values=[
_descriptor.EnumValueDescriptor(
name='UNAVAILABLE_NETWORK_TYPE', index=0, number=-2,
- serialized_options=None,
- type=None,
- create_key=_descriptor._internal_create_key),
+ options=None,
+ type=None),
_descriptor.EnumValueDescriptor(
name='CALL_SETUP_FAILURE', index=1, number=-1,
- serialized_options=None,
- type=None,
- create_key=_descriptor._internal_create_key),
+ options=None,
+ type=None),
_descriptor.EnumValueDescriptor(
name='SUCCESS', index=2, number=0,
- serialized_options=None,
- type=None,
- create_key=_descriptor._internal_create_key),
+ options=None,
+ type=None),
_descriptor.EnumValueDescriptor(
name='INITIATE_FAILED', index=3, number=1,
- serialized_options=None,
- type=None,
- create_key=_descriptor._internal_create_key),
+ options=None,
+ type=None),
_descriptor.EnumValueDescriptor(
name='NO_RING_EVENT_OR_ANSWER_FAILED', index=4, number=2,
- serialized_options=None,
- type=None,
- create_key=_descriptor._internal_create_key),
+ options=None,
+ type=None),
_descriptor.EnumValueDescriptor(
name='NO_CALL_ID_FOUND', index=5, number=3,
- serialized_options=None,
- type=None,
- create_key=_descriptor._internal_create_key),
+ options=None,
+ type=None),
_descriptor.EnumValueDescriptor(
name='CALL_STATE_NOT_ACTIVE_DURING_ESTABLISHMENT', index=6, number=4,
- serialized_options=None,
- type=None,
- create_key=_descriptor._internal_create_key),
+ options=None,
+ type=None),
_descriptor.EnumValueDescriptor(
name='AUDIO_STATE_NOT_INCALL_DURING_ESTABLISHMENT', index=7, number=5,
- serialized_options=None,
- type=None,
- create_key=_descriptor._internal_create_key),
+ options=None,
+ type=None),
_descriptor.EnumValueDescriptor(
name='AUDIO_STATE_NOT_INCALL_AFTER_CONNECTED', index=8, number=6,
- serialized_options=None,
- type=None,
- create_key=_descriptor._internal_create_key),
+ options=None,
+ type=None),
_descriptor.EnumValueDescriptor(
name='CALL_DROP_OR_WRONG_STATE_DURING_ESTABLISHMENT', index=9, number=7,
- serialized_options=None,
- type=None,
- create_key=_descriptor._internal_create_key),
+ options=None,
+ type=None),
_descriptor.EnumValueDescriptor(
name='CALL_DROP_OR_WRONG_STATE_AFTER_CONNECTED', index=10, number=8,
- serialized_options=None,
- type=None,
- create_key=_descriptor._internal_create_key),
+ options=None,
+ type=None),
_descriptor.EnumValueDescriptor(
name='CALL_HANGUP_FAIL', index=11, number=9,
- serialized_options=None,
- type=None,
- create_key=_descriptor._internal_create_key),
+ options=None,
+ type=None),
_descriptor.EnumValueDescriptor(
name='CALL_ID_CLEANUP_FAIL', index=12, number=10,
- serialized_options=None,
- type=None,
- create_key=_descriptor._internal_create_key),
+ options=None,
+ type=None),
],
containing_type=None,
- serialized_options=None,
+ options=None,
serialized_start=248,
serialized_end=710,
)
@@ -111,7 +97,6 @@
filename=None,
file=DESCRIPTOR,
containing_type=None,
- create_key=_descriptor._internal_create_key,
fields=[
_descriptor.FieldDescriptor(
name='result', full_name='wireless.android.platform.testing.telephony.metrics.TelephonyVoiceTestResult.result', index=0,
@@ -119,14 +104,14 @@
has_default_value=False, default_value=-2,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ options=None),
_descriptor.FieldDescriptor(
name='call_setup_time_latency', full_name='wireless.android.platform.testing.telephony.metrics.TelephonyVoiceTestResult.call_setup_time_latency', index=1,
number=2, type=2, cpp_type=6, label=1,
has_default_value=False, default_value=float(0),
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ options=None),
],
extensions=[
],
@@ -134,7 +119,7 @@
enum_types=[
_TELEPHONYVOICETESTRESULT_CALLRESULT,
],
- serialized_options=None,
+ options=None,
is_extendable=False,
syntax='proto2',
extension_ranges=[],
@@ -151,7 +136,6 @@
filename=None,
file=DESCRIPTOR,
containing_type=None,
- create_key=_descriptor._internal_create_key,
fields=[
_descriptor.FieldDescriptor(
name='results', full_name='wireless.android.platform.testing.telephony.metrics.TelephonyVoiceStressResult.results', index=0,
@@ -159,14 +143,14 @@
has_default_value=False, default_value=[],
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
- serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key),
+ options=None),
],
extensions=[
],
nested_types=[],
enum_types=[
],
- serialized_options=None,
+ options=None,
is_extendable=False,
syntax='proto2',
extension_ranges=[],
@@ -183,18 +167,18 @@
DESCRIPTOR.message_types_by_name['TelephonyVoiceStressResult'] = _TELEPHONYVOICESTRESSRESULT
_sym_db.RegisterFileDescriptor(DESCRIPTOR)
-TelephonyVoiceTestResult = _reflection.GeneratedProtocolMessageType('TelephonyVoiceTestResult', (_message.Message,), {
- 'DESCRIPTOR' : _TELEPHONYVOICETESTRESULT,
- '__module__' : 'telephony_metric_pb2'
+TelephonyVoiceTestResult = _reflection.GeneratedProtocolMessageType('TelephonyVoiceTestResult', (_message.Message,), dict(
+ DESCRIPTOR = _TELEPHONYVOICETESTRESULT,
+ __module__ = 'telephony_metric_pb2'
# @@protoc_insertion_point(class_scope:wireless.android.platform.testing.telephony.metrics.TelephonyVoiceTestResult)
- })
+ ))
_sym_db.RegisterMessage(TelephonyVoiceTestResult)
-TelephonyVoiceStressResult = _reflection.GeneratedProtocolMessageType('TelephonyVoiceStressResult', (_message.Message,), {
- 'DESCRIPTOR' : _TELEPHONYVOICESTRESSRESULT,
- '__module__' : 'telephony_metric_pb2'
+TelephonyVoiceStressResult = _reflection.GeneratedProtocolMessageType('TelephonyVoiceStressResult', (_message.Message,), dict(
+ DESCRIPTOR = _TELEPHONYVOICESTRESSRESULT,
+ __module__ = 'telephony_metric_pb2'
# @@protoc_insertion_point(class_scope:wireless.android.platform.testing.telephony.metrics.TelephonyVoiceStressResult)
- })
+ ))
_sym_db.RegisterMessage(TelephonyVoiceStressResult)
diff --git a/acts_tests/acts_contrib/test_utils/tel/loggers/telephony_metric_logger.py b/acts/framework/acts/test_utils/tel/loggers/telephony_metric_logger.py
similarity index 93%
rename from acts_tests/acts_contrib/test_utils/tel/loggers/telephony_metric_logger.py
rename to acts/framework/acts/test_utils/tel/loggers/telephony_metric_logger.py
index 9869390..a1c2a6b 100644
--- a/acts_tests/acts_contrib/test_utils/tel/loggers/telephony_metric_logger.py
+++ b/acts/framework/acts/test_utils/tel/loggers/telephony_metric_logger.py
@@ -20,7 +20,7 @@
from acts.metrics.core import ProtoMetric
from acts.metrics.logger import MetricLogger
-from acts_contrib.test_utils.tel.loggers.protos.telephony_metric_pb2 import TelephonyVoiceTestResult
+from acts.test_utils.tel.loggers.protos.telephony_metric_pb2 import TelephonyVoiceTestResult
# Initializes the path to the protobuf
PROTO_PATH = os.path.join(os.path.dirname(__file__),
diff --git a/acts_tests/acts_contrib/test_utils/tel/tel_atten_utils.py b/acts/framework/acts/test_utils/tel/tel_atten_utils.py
similarity index 93%
rename from acts_tests/acts_contrib/test_utils/tel/tel_atten_utils.py
rename to acts/framework/acts/test_utils/tel/tel_atten_utils.py
index 8e47a89..7fa73d3 100644
--- a/acts_tests/acts_contrib/test_utils/tel/tel_atten_utils.py
+++ b/acts/framework/acts/test_utils/tel/tel_atten_utils.py
@@ -16,10 +16,10 @@
import time
import math
-from acts_contrib.test_utils.tel.tel_defines import ATTEN_MAX_VALUE
-from acts_contrib.test_utils.tel.tel_defines import ATTEN_MIN_VALUE
-from acts_contrib.test_utils.tel.tel_defines import MAX_RSSI_RESERVED_VALUE
-from acts_contrib.test_utils.tel.tel_defines import MIN_RSSI_RESERVED_VALUE
+from acts.test_utils.tel.tel_defines import ATTEN_MAX_VALUE
+from acts.test_utils.tel.tel_defines import ATTEN_MIN_VALUE
+from acts.test_utils.tel.tel_defines import MAX_RSSI_RESERVED_VALUE
+from acts.test_utils.tel.tel_defines import MIN_RSSI_RESERVED_VALUE
def get_atten(log, atten_obj):
diff --git a/acts_tests/acts_contrib/test_utils/tel/tel_data_utils.py b/acts/framework/acts/test_utils/tel/tel_data_utils.py
similarity index 89%
rename from acts_tests/acts_contrib/test_utils/tel/tel_data_utils.py
rename to acts/framework/acts/test_utils/tel/tel_data_utils.py
index bac587e..94cd86c 100644
--- a/acts_tests/acts_contrib/test_utils/tel/tel_data_utils.py
+++ b/acts/framework/acts/test_utils/tel/tel_data_utils.py
@@ -19,46 +19,46 @@
import re
from acts.utils import rand_ascii_str
-from acts_contrib.test_utils.tel.tel_subscription_utils import \
+from acts.test_utils.tel.tel_subscription_utils import \
get_subid_from_slot_index
-from acts_contrib.test_utils.tel.tel_subscription_utils import set_subid_for_data
-from acts_contrib.test_utils.tel.tel_subscription_utils import get_outgoing_message_sub_id
-from acts_contrib.test_utils.tel.tel_subscription_utils import get_outgoing_voice_sub_id
-from acts_contrib.test_utils.tel.tel_defines import MAX_WAIT_TIME_NW_SELECTION
-from acts_contrib.test_utils.tel.tel_defines import NETWORK_SERVICE_DATA
-from acts_contrib.test_utils.tel.tel_defines import NETWORK_SERVICE_VOICE
-from acts_contrib.test_utils.tel.tel_defines import WAIT_TIME_AFTER_REBOOT
-from acts_contrib.test_utils.tel.tel_defines import WAIT_TIME_ANDROID_STATE_SETTLING
-from acts_contrib.test_utils.tel.tel_defines import WAIT_TIME_BETWEEN_STATE_CHECK
-from acts_contrib.test_utils.tel.tel_defines import MAX_WAIT_TIME_FOR_STATE_CHANGE
-from acts_contrib.test_utils.tel.tel_defines import WAIT_TIME_AFTER_REBOOT
-from acts_contrib.test_utils.tel.tel_defines import RAT_UNKNOWN
-from acts_contrib.test_utils.tel.tel_subscription_utils import get_default_data_sub_id
-from acts_contrib.test_utils.tel.tel_subscription_utils import get_outgoing_voice_sub_id
-from acts_contrib.test_utils.tel.tel_subscription_utils import get_outgoing_message_sub_id
-from acts_contrib.test_utils.tel.tel_test_utils import start_youtube_video
-from acts_contrib.test_utils.tel.tel_test_utils import start_wifi_tethering
-from acts_contrib.test_utils.tel.tel_test_utils import stop_wifi_tethering
-from acts_contrib.test_utils.tel.tel_test_utils import ensure_network_generation_for_subscription
-from acts_contrib.test_utils.tel.tel_test_utils import ensure_phones_idle
-from acts_contrib.test_utils.tel.tel_test_utils import ensure_wifi_connected
-from acts_contrib.test_utils.tel.tel_test_utils import get_network_rat_for_subscription
-from acts_contrib.test_utils.tel.tel_test_utils import is_droid_in_network_generation_for_subscription
-from acts_contrib.test_utils.tel.tel_test_utils import rat_generation_from_rat
-from acts_contrib.test_utils.tel.tel_test_utils import set_wifi_to_default
-from acts_contrib.test_utils.tel.tel_test_utils import toggle_airplane_mode
-from acts_contrib.test_utils.tel.tel_test_utils import verify_internet_connection
-from acts_contrib.test_utils.tel.tel_test_utils import wait_for_cell_data_connection
-from acts_contrib.test_utils.tel.tel_test_utils import wait_for_wifi_data_connection
-from acts_contrib.test_utils.tel.tel_test_utils import wait_for_data_attach_for_subscription
-from acts_contrib.test_utils.tel.tel_test_utils import wifi_toggle_state
-from acts_contrib.test_utils.tel.tel_test_utils import WIFI_CONFIG_APBAND_2G
-from acts_contrib.test_utils.tel.tel_test_utils import WIFI_CONFIG_APBAND_5G
-from acts_contrib.test_utils.tel.tel_test_utils import get_service_state_by_adb
-from acts_contrib.test_utils.tel.tel_test_utils import wait_for_state
-from acts_contrib.test_utils.tel.tel_test_utils import get_mobile_data_usage
-from acts_contrib.test_utils.tel.tel_test_utils import get_wifi_usage
-from acts_contrib.test_utils.tel.tel_test_utils import check_is_wifi_connected
+from acts.test_utils.tel.tel_subscription_utils import set_subid_for_data
+from acts.test_utils.tel.tel_subscription_utils import get_outgoing_message_sub_id
+from acts.test_utils.tel.tel_subscription_utils import get_outgoing_voice_sub_id
+from acts.test_utils.tel.tel_defines import MAX_WAIT_TIME_NW_SELECTION
+from acts.test_utils.tel.tel_defines import NETWORK_SERVICE_DATA
+from acts.test_utils.tel.tel_defines import NETWORK_SERVICE_VOICE
+from acts.test_utils.tel.tel_defines import WAIT_TIME_AFTER_REBOOT
+from acts.test_utils.tel.tel_defines import WAIT_TIME_ANDROID_STATE_SETTLING
+from acts.test_utils.tel.tel_defines import WAIT_TIME_BETWEEN_STATE_CHECK
+from acts.test_utils.tel.tel_defines import MAX_WAIT_TIME_FOR_STATE_CHANGE
+from acts.test_utils.tel.tel_defines import WAIT_TIME_AFTER_REBOOT
+from acts.test_utils.tel.tel_defines import RAT_UNKNOWN
+from acts.test_utils.tel.tel_subscription_utils import get_default_data_sub_id
+from acts.test_utils.tel.tel_subscription_utils import get_outgoing_voice_sub_id
+from acts.test_utils.tel.tel_subscription_utils import get_outgoing_message_sub_id
+from acts.test_utils.tel.tel_test_utils import start_youtube_video
+from acts.test_utils.tel.tel_test_utils import start_wifi_tethering
+from acts.test_utils.tel.tel_test_utils import stop_wifi_tethering
+from acts.test_utils.tel.tel_test_utils import ensure_network_generation_for_subscription
+from acts.test_utils.tel.tel_test_utils import ensure_phones_idle
+from acts.test_utils.tel.tel_test_utils import ensure_wifi_connected
+from acts.test_utils.tel.tel_test_utils import get_network_rat_for_subscription
+from acts.test_utils.tel.tel_test_utils import is_droid_in_network_generation_for_subscription
+from acts.test_utils.tel.tel_test_utils import rat_generation_from_rat
+from acts.test_utils.tel.tel_test_utils import set_wifi_to_default
+from acts.test_utils.tel.tel_test_utils import toggle_airplane_mode
+from acts.test_utils.tel.tel_test_utils import verify_internet_connection
+from acts.test_utils.tel.tel_test_utils import wait_for_cell_data_connection
+from acts.test_utils.tel.tel_test_utils import wait_for_wifi_data_connection
+from acts.test_utils.tel.tel_test_utils import wait_for_data_attach_for_subscription
+from acts.test_utils.tel.tel_test_utils import wifi_toggle_state
+from acts.test_utils.tel.tel_test_utils import WIFI_CONFIG_APBAND_2G
+from acts.test_utils.tel.tel_test_utils import WIFI_CONFIG_APBAND_5G
+from acts.test_utils.tel.tel_test_utils import get_service_state_by_adb
+from acts.test_utils.tel.tel_test_utils import wait_for_state
+from acts.test_utils.tel.tel_test_utils import get_mobile_data_usage
+from acts.test_utils.tel.tel_test_utils import get_wifi_usage
+from acts.test_utils.tel.tel_test_utils import check_is_wifi_connected
def wifi_tethering_cleanup(log, provider, client_list):
"""Clean up steps for WiFi Tethering.
diff --git a/acts_tests/acts_contrib/test_utils/tel/tel_defines.py b/acts/framework/acts/test_utils/tel/tel_defines.py
similarity index 100%
rename from acts_tests/acts_contrib/test_utils/tel/tel_defines.py
rename to acts/framework/acts/test_utils/tel/tel_defines.py
diff --git a/acts_tests/acts_contrib/test_utils/tel/tel_lookup_tables.py b/acts/framework/acts/test_utils/tel/tel_lookup_tables.py
similarity index 99%
rename from acts_tests/acts_contrib/test_utils/tel/tel_lookup_tables.py
rename to acts/framework/acts/test_utils/tel/tel_lookup_tables.py
index c794fa6..728ffbf 100644
--- a/acts_tests/acts_contrib/test_utils/tel/tel_lookup_tables.py
+++ b/acts/framework/acts/test_utils/tel/tel_lookup_tables.py
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
from acts.utils import NexusModelNames
-from acts_contrib.test_utils.tel import tel_defines
+from acts.test_utils.tel import tel_defines
def rat_family_from_rat(rat_type):
diff --git a/acts_tests/acts_contrib/test_utils/tel/tel_subscription_utils.py b/acts/framework/acts/test_utils/tel/tel_subscription_utils.py
similarity index 98%
rename from acts_tests/acts_contrib/test_utils/tel/tel_subscription_utils.py
rename to acts/framework/acts/test_utils/tel/tel_subscription_utils.py
index 69d9e11..bd5de39 100644
--- a/acts_tests/acts_contrib/test_utils/tel/tel_subscription_utils.py
+++ b/acts/framework/acts/test_utils/tel/tel_subscription_utils.py
@@ -18,9 +18,9 @@
# It will be deleted once we have better solution for subscription ids.
from future import standard_library
standard_library.install_aliases()
-from acts_contrib.test_utils.tel.tel_defines import INVALID_SUB_ID
-from acts_contrib.test_utils.tel.tel_defines import WAIT_TIME_CHANGE_DATA_SUB_ID
-from acts_contrib.test_utils.tel.tel_defines import MAX_WAIT_TIME_NW_SELECTION
+from acts.test_utils.tel.tel_defines import INVALID_SUB_ID
+from acts.test_utils.tel.tel_defines import WAIT_TIME_CHANGE_DATA_SUB_ID
+from acts.test_utils.tel.tel_defines import MAX_WAIT_TIME_NW_SELECTION
import time
diff --git a/acts_tests/acts_contrib/test_utils/tel/tel_test_utils.py b/acts/framework/acts/test_utils/tel/tel_test_utils.py
similarity index 96%
rename from acts_tests/acts_contrib/test_utils/tel/tel_test_utils.py
rename to acts/framework/acts/test_utils/tel/tel_test_utils.py
index 846a2f9..899d1db 100644
--- a/acts_tests/acts_contrib/test_utils/tel/tel_test_utils.py
+++ b/acts/framework/acts/test_utils/tel/tel_test_utils.py
@@ -40,152 +40,152 @@
from acts.controllers.android_device import DEFAULT_SDM_LOG_PATH
from acts.controllers.android_device import SL4A_APK_NAME
from acts.libs.proc import job
-from acts_contrib.test_utils.tel.loggers.protos.telephony_metric_pb2 import TelephonyVoiceTestResult
-from acts_contrib.test_utils.tel.tel_defines import CarrierConfigs, CARRIER_NTT_DOCOMO, CARRIER_KDDI, CARRIER_RAKUTEN, \
+from acts.test_utils.tel.loggers.protos.telephony_metric_pb2 import TelephonyVoiceTestResult
+from acts.test_utils.tel.tel_defines import CarrierConfigs, CARRIER_NTT_DOCOMO, CARRIER_KDDI, CARRIER_RAKUTEN, \
CARRIER_SBM
-from acts_contrib.test_utils.tel.tel_defines import AOSP_PREFIX
-from acts_contrib.test_utils.tel.tel_defines import CARD_POWER_DOWN
-from acts_contrib.test_utils.tel.tel_defines import CARD_POWER_UP
-from acts_contrib.test_utils.tel.tel_defines import CAPABILITY_CONFERENCE
-from acts_contrib.test_utils.tel.tel_defines import CAPABILITY_VOLTE
-from acts_contrib.test_utils.tel.tel_defines import CAPABILITY_VOLTE_PROVISIONING
-from acts_contrib.test_utils.tel.tel_defines import CAPABILITY_VOLTE_OVERRIDE_WFC_PROVISIONING
-from acts_contrib.test_utils.tel.tel_defines import CAPABILITY_HIDE_ENHANCED_4G_LTE_BOOL
-from acts_contrib.test_utils.tel.tel_defines import CAPABILITY_VT
-from acts_contrib.test_utils.tel.tel_defines import CAPABILITY_WFC
-from acts_contrib.test_utils.tel.tel_defines import CAPABILITY_WFC_MODE_CHANGE
-from acts_contrib.test_utils.tel.tel_defines import CARRIER_UNKNOWN
-from acts_contrib.test_utils.tel.tel_defines import CARRIER_FRE
-from acts_contrib.test_utils.tel.tel_defines import COUNTRY_CODE_LIST
-from acts_contrib.test_utils.tel.tel_defines import DATA_STATE_CONNECTED
-from acts_contrib.test_utils.tel.tel_defines import DATA_STATE_DISCONNECTED
-from acts_contrib.test_utils.tel.tel_defines import DATA_ROAMING_ENABLE
-from acts_contrib.test_utils.tel.tel_defines import DATA_ROAMING_DISABLE
-from acts_contrib.test_utils.tel.tel_defines import GEN_4G
-from acts_contrib.test_utils.tel.tel_defines import GEN_UNKNOWN
-from acts_contrib.test_utils.tel.tel_defines import INCALL_UI_DISPLAY_BACKGROUND
-from acts_contrib.test_utils.tel.tel_defines import INCALL_UI_DISPLAY_FOREGROUND
-from acts_contrib.test_utils.tel.tel_defines import INVALID_SIM_SLOT_INDEX
-from acts_contrib.test_utils.tel.tel_defines import INVALID_SUB_ID
-from acts_contrib.test_utils.tel.tel_defines import MAX_SAVED_VOICE_MAIL
-from acts_contrib.test_utils.tel.tel_defines import MAX_SCREEN_ON_TIME
-from acts_contrib.test_utils.tel.tel_defines import MAX_WAIT_TIME_ACCEPT_CALL_TO_OFFHOOK_EVENT
-from acts_contrib.test_utils.tel.tel_defines import MAX_WAIT_TIME_AIRPLANEMODE_EVENT
-from acts_contrib.test_utils.tel.tel_defines import MAX_WAIT_TIME_CALL_DROP
-from acts_contrib.test_utils.tel.tel_defines import MAX_WAIT_TIME_CALL_INITIATION
-from acts_contrib.test_utils.tel.tel_defines import MAX_WAIT_TIME_CALLEE_RINGING
-from acts_contrib.test_utils.tel.tel_defines import MAX_WAIT_TIME_CONNECTION_STATE_UPDATE
-from acts_contrib.test_utils.tel.tel_defines import MAX_WAIT_TIME_DATA_SUB_CHANGE
-from acts_contrib.test_utils.tel.tel_defines import MAX_WAIT_TIME_CALL_IDLE_EVENT
-from acts_contrib.test_utils.tel.tel_defines import MAX_WAIT_TIME_NW_SELECTION
-from acts_contrib.test_utils.tel.tel_defines import MAX_WAIT_TIME_SMS_RECEIVE
-from acts_contrib.test_utils.tel.tel_defines import MAX_WAIT_TIME_SMS_RECEIVE_IN_COLLISION
-from acts_contrib.test_utils.tel.tel_defines import MAX_WAIT_TIME_SMS_SENT_SUCCESS
-from acts_contrib.test_utils.tel.tel_defines import MAX_WAIT_TIME_SMS_SENT_SUCCESS_IN_COLLISION
-from acts_contrib.test_utils.tel.tel_defines import MAX_WAIT_TIME_TELECOM_RINGING
-from acts_contrib.test_utils.tel.tel_defines import MAX_WAIT_TIME_VOICE_MAIL_COUNT
-from acts_contrib.test_utils.tel.tel_defines import MAX_WAIT_TIME_VOLTE_ENABLED
-from acts_contrib.test_utils.tel.tel_defines import MAX_WAIT_TIME_WFC_DISABLED
-from acts_contrib.test_utils.tel.tel_defines import MAX_WAIT_TIME_WFC_ENABLED
-from acts_contrib.test_utils.tel.tel_defines import WAIT_TIME_FOR_DATA_STALL
-from acts_contrib.test_utils.tel.tel_defines import WAIT_TIME_FOR_NW_VALID_FAIL
-from acts_contrib.test_utils.tel.tel_defines import WAIT_TIME_FOR_DATA_STALL_RECOVERY
-from acts_contrib.test_utils.tel.tel_defines import NETWORK_MODE_LTE_ONLY
-from acts_contrib.test_utils.tel.tel_defines import NETWORK_CONNECTION_TYPE_CELL
-from acts_contrib.test_utils.tel.tel_defines import NETWORK_CONNECTION_TYPE_WIFI
-from acts_contrib.test_utils.tel.tel_defines import NETWORK_SERVICE_DATA
-from acts_contrib.test_utils.tel.tel_defines import NETWORK_SERVICE_VOICE
-from acts_contrib.test_utils.tel.tel_defines import PHONE_NUMBER_STRING_FORMAT_7_DIGIT
-from acts_contrib.test_utils.tel.tel_defines import PHONE_NUMBER_STRING_FORMAT_10_DIGIT
-from acts_contrib.test_utils.tel.tel_defines import PHONE_NUMBER_STRING_FORMAT_11_DIGIT
-from acts_contrib.test_utils.tel.tel_defines import PHONE_NUMBER_STRING_FORMAT_12_DIGIT
-from acts_contrib.test_utils.tel.tel_defines import RAT_FAMILY_GSM
-from acts_contrib.test_utils.tel.tel_defines import RAT_FAMILY_LTE
-from acts_contrib.test_utils.tel.tel_defines import RAT_FAMILY_WLAN
-from acts_contrib.test_utils.tel.tel_defines import RAT_FAMILY_WCDMA
-from acts_contrib.test_utils.tel.tel_defines import RAT_1XRTT
-from acts_contrib.test_utils.tel.tel_defines import RAT_UNKNOWN
-from acts_contrib.test_utils.tel.tel_defines import SERVICE_STATE_EMERGENCY_ONLY
-from acts_contrib.test_utils.tel.tel_defines import SERVICE_STATE_IN_SERVICE
-from acts_contrib.test_utils.tel.tel_defines import SERVICE_STATE_MAPPING
-from acts_contrib.test_utils.tel.tel_defines import SERVICE_STATE_OUT_OF_SERVICE
-from acts_contrib.test_utils.tel.tel_defines import SERVICE_STATE_POWER_OFF
-from acts_contrib.test_utils.tel.tel_defines import SIM_STATE_ABSENT
-from acts_contrib.test_utils.tel.tel_defines import SIM_STATE_LOADED
-from acts_contrib.test_utils.tel.tel_defines import SIM_STATE_NOT_READY
-from acts_contrib.test_utils.tel.tel_defines import SIM_STATE_PIN_REQUIRED
-from acts_contrib.test_utils.tel.tel_defines import SIM_STATE_READY
-from acts_contrib.test_utils.tel.tel_defines import SIM_STATE_UNKNOWN
-from acts_contrib.test_utils.tel.tel_defines import TELEPHONY_STATE_IDLE
-from acts_contrib.test_utils.tel.tel_defines import TELEPHONY_STATE_OFFHOOK
-from acts_contrib.test_utils.tel.tel_defines import TELEPHONY_STATE_RINGING
-from acts_contrib.test_utils.tel.tel_defines import VOICEMAIL_DELETE_DIGIT
-from acts_contrib.test_utils.tel.tel_defines import WAIT_TIME_1XRTT_VOICE_ATTACH
-from acts_contrib.test_utils.tel.tel_defines import WAIT_TIME_ANDROID_STATE_SETTLING
-from acts_contrib.test_utils.tel.tel_defines import WAIT_TIME_BETWEEN_STATE_CHECK
-from acts_contrib.test_utils.tel.tel_defines import MAX_WAIT_TIME_FOR_STATE_CHANGE
-from acts_contrib.test_utils.tel.tel_defines import WAIT_TIME_CHANGE_DATA_SUB_ID
-from acts_contrib.test_utils.tel.tel_defines import WAIT_TIME_IN_CALL
-from acts_contrib.test_utils.tel.tel_defines import WAIT_TIME_LEAVE_VOICE_MAIL
-from acts_contrib.test_utils.tel.tel_defines import WAIT_TIME_REJECT_CALL
-from acts_contrib.test_utils.tel.tel_defines import WAIT_TIME_SYNC_DATE_TIME_FROM_NETWORK
-from acts_contrib.test_utils.tel.tel_defines import WAIT_TIME_VOICE_MAIL_SERVER_RESPONSE
-from acts_contrib.test_utils.tel.tel_defines import WFC_MODE_DISABLED
-from acts_contrib.test_utils.tel.tel_defines import WFC_MODE_CELLULAR_PREFERRED
-from acts_contrib.test_utils.tel.tel_defines import WFC_MODE_WIFI_ONLY
-from acts_contrib.test_utils.tel.tel_defines import WFC_MODE_WIFI_PREFERRED
-from acts_contrib.test_utils.tel.tel_defines import TYPE_MOBILE
-from acts_contrib.test_utils.tel.tel_defines import TYPE_WIFI
-from acts_contrib.test_utils.tel.tel_defines import EventCallStateChanged
-from acts_contrib.test_utils.tel.tel_defines import EventActiveDataSubIdChanged
-from acts_contrib.test_utils.tel.tel_defines import EventDisplayInfoChanged
-from acts_contrib.test_utils.tel.tel_defines import EventConnectivityChanged
-from acts_contrib.test_utils.tel.tel_defines import EventDataConnectionStateChanged
-from acts_contrib.test_utils.tel.tel_defines import EventDataSmsReceived
-from acts_contrib.test_utils.tel.tel_defines import EventMessageWaitingIndicatorChanged
-from acts_contrib.test_utils.tel.tel_defines import EventServiceStateChanged
-from acts_contrib.test_utils.tel.tel_defines import EventMmsSentFailure
-from acts_contrib.test_utils.tel.tel_defines import EventMmsSentSuccess
-from acts_contrib.test_utils.tel.tel_defines import EventMmsDownloaded
-from acts_contrib.test_utils.tel.tel_defines import EventSmsReceived
-from acts_contrib.test_utils.tel.tel_defines import EventSmsDeliverFailure
-from acts_contrib.test_utils.tel.tel_defines import EventSmsDeliverSuccess
-from acts_contrib.test_utils.tel.tel_defines import EventSmsSentFailure
-from acts_contrib.test_utils.tel.tel_defines import EventSmsSentSuccess
-from acts_contrib.test_utils.tel.tel_defines import CallStateContainer
-from acts_contrib.test_utils.tel.tel_defines import DataConnectionStateContainer
-from acts_contrib.test_utils.tel.tel_defines import MessageWaitingIndicatorContainer
-from acts_contrib.test_utils.tel.tel_defines import NetworkCallbackContainer
-from acts_contrib.test_utils.tel.tel_defines import ServiceStateContainer
-from acts_contrib.test_utils.tel.tel_defines import DisplayInfoContainer
-from acts_contrib.test_utils.tel.tel_defines import OverrideNetworkContainer
-from acts_contrib.test_utils.tel.tel_defines import NETWORK_MODE_NR_LTE_GSM_WCDMA
-from acts_contrib.test_utils.tel.tel_defines import CARRIER_VZW, CARRIER_ATT, \
+from acts.test_utils.tel.tel_defines import AOSP_PREFIX
+from acts.test_utils.tel.tel_defines import CARD_POWER_DOWN
+from acts.test_utils.tel.tel_defines import CARD_POWER_UP
+from acts.test_utils.tel.tel_defines import CAPABILITY_CONFERENCE
+from acts.test_utils.tel.tel_defines import CAPABILITY_VOLTE
+from acts.test_utils.tel.tel_defines import CAPABILITY_VOLTE_PROVISIONING
+from acts.test_utils.tel.tel_defines import CAPABILITY_VOLTE_OVERRIDE_WFC_PROVISIONING
+from acts.test_utils.tel.tel_defines import CAPABILITY_HIDE_ENHANCED_4G_LTE_BOOL
+from acts.test_utils.tel.tel_defines import CAPABILITY_VT
+from acts.test_utils.tel.tel_defines import CAPABILITY_WFC
+from acts.test_utils.tel.tel_defines import CAPABILITY_WFC_MODE_CHANGE
+from acts.test_utils.tel.tel_defines import CARRIER_UNKNOWN
+from acts.test_utils.tel.tel_defines import CARRIER_FRE
+from acts.test_utils.tel.tel_defines import COUNTRY_CODE_LIST
+from acts.test_utils.tel.tel_defines import DATA_STATE_CONNECTED
+from acts.test_utils.tel.tel_defines import DATA_STATE_DISCONNECTED
+from acts.test_utils.tel.tel_defines import DATA_ROAMING_ENABLE
+from acts.test_utils.tel.tel_defines import DATA_ROAMING_DISABLE
+from acts.test_utils.tel.tel_defines import GEN_4G
+from acts.test_utils.tel.tel_defines import GEN_UNKNOWN
+from acts.test_utils.tel.tel_defines import INCALL_UI_DISPLAY_BACKGROUND
+from acts.test_utils.tel.tel_defines import INCALL_UI_DISPLAY_FOREGROUND
+from acts.test_utils.tel.tel_defines import INVALID_SIM_SLOT_INDEX
+from acts.test_utils.tel.tel_defines import INVALID_SUB_ID
+from acts.test_utils.tel.tel_defines import MAX_SAVED_VOICE_MAIL
+from acts.test_utils.tel.tel_defines import MAX_SCREEN_ON_TIME
+from acts.test_utils.tel.tel_defines import MAX_WAIT_TIME_ACCEPT_CALL_TO_OFFHOOK_EVENT
+from acts.test_utils.tel.tel_defines import MAX_WAIT_TIME_AIRPLANEMODE_EVENT
+from acts.test_utils.tel.tel_defines import MAX_WAIT_TIME_CALL_DROP
+from acts.test_utils.tel.tel_defines import MAX_WAIT_TIME_CALL_INITIATION
+from acts.test_utils.tel.tel_defines import MAX_WAIT_TIME_CALLEE_RINGING
+from acts.test_utils.tel.tel_defines import MAX_WAIT_TIME_CONNECTION_STATE_UPDATE
+from acts.test_utils.tel.tel_defines import MAX_WAIT_TIME_DATA_SUB_CHANGE
+from acts.test_utils.tel.tel_defines import MAX_WAIT_TIME_CALL_IDLE_EVENT
+from acts.test_utils.tel.tel_defines import MAX_WAIT_TIME_NW_SELECTION
+from acts.test_utils.tel.tel_defines import MAX_WAIT_TIME_SMS_RECEIVE
+from acts.test_utils.tel.tel_defines import MAX_WAIT_TIME_SMS_RECEIVE_IN_COLLISION
+from acts.test_utils.tel.tel_defines import MAX_WAIT_TIME_SMS_SENT_SUCCESS
+from acts.test_utils.tel.tel_defines import MAX_WAIT_TIME_SMS_SENT_SUCCESS_IN_COLLISION
+from acts.test_utils.tel.tel_defines import MAX_WAIT_TIME_TELECOM_RINGING
+from acts.test_utils.tel.tel_defines import MAX_WAIT_TIME_VOICE_MAIL_COUNT
+from acts.test_utils.tel.tel_defines import MAX_WAIT_TIME_VOLTE_ENABLED
+from acts.test_utils.tel.tel_defines import MAX_WAIT_TIME_WFC_DISABLED
+from acts.test_utils.tel.tel_defines import MAX_WAIT_TIME_WFC_ENABLED
+from acts.test_utils.tel.tel_defines import WAIT_TIME_FOR_DATA_STALL
+from acts.test_utils.tel.tel_defines import WAIT_TIME_FOR_NW_VALID_FAIL
+from acts.test_utils.tel.tel_defines import WAIT_TIME_FOR_DATA_STALL_RECOVERY
+from acts.test_utils.tel.tel_defines import NETWORK_MODE_LTE_ONLY
+from acts.test_utils.tel.tel_defines import NETWORK_CONNECTION_TYPE_CELL
+from acts.test_utils.tel.tel_defines import NETWORK_CONNECTION_TYPE_WIFI
+from acts.test_utils.tel.tel_defines import NETWORK_SERVICE_DATA
+from acts.test_utils.tel.tel_defines import NETWORK_SERVICE_VOICE
+from acts.test_utils.tel.tel_defines import PHONE_NUMBER_STRING_FORMAT_7_DIGIT
+from acts.test_utils.tel.tel_defines import PHONE_NUMBER_STRING_FORMAT_10_DIGIT
+from acts.test_utils.tel.tel_defines import PHONE_NUMBER_STRING_FORMAT_11_DIGIT
+from acts.test_utils.tel.tel_defines import PHONE_NUMBER_STRING_FORMAT_12_DIGIT
+from acts.test_utils.tel.tel_defines import RAT_FAMILY_GSM
+from acts.test_utils.tel.tel_defines import RAT_FAMILY_LTE
+from acts.test_utils.tel.tel_defines import RAT_FAMILY_WLAN
+from acts.test_utils.tel.tel_defines import RAT_FAMILY_WCDMA
+from acts.test_utils.tel.tel_defines import RAT_1XRTT
+from acts.test_utils.tel.tel_defines import RAT_UNKNOWN
+from acts.test_utils.tel.tel_defines import SERVICE_STATE_EMERGENCY_ONLY
+from acts.test_utils.tel.tel_defines import SERVICE_STATE_IN_SERVICE
+from acts.test_utils.tel.tel_defines import SERVICE_STATE_MAPPING
+from acts.test_utils.tel.tel_defines import SERVICE_STATE_OUT_OF_SERVICE
+from acts.test_utils.tel.tel_defines import SERVICE_STATE_POWER_OFF
+from acts.test_utils.tel.tel_defines import SIM_STATE_ABSENT
+from acts.test_utils.tel.tel_defines import SIM_STATE_LOADED
+from acts.test_utils.tel.tel_defines import SIM_STATE_NOT_READY
+from acts.test_utils.tel.tel_defines import SIM_STATE_PIN_REQUIRED
+from acts.test_utils.tel.tel_defines import SIM_STATE_READY
+from acts.test_utils.tel.tel_defines import SIM_STATE_UNKNOWN
+from acts.test_utils.tel.tel_defines import TELEPHONY_STATE_IDLE
+from acts.test_utils.tel.tel_defines import TELEPHONY_STATE_OFFHOOK
+from acts.test_utils.tel.tel_defines import TELEPHONY_STATE_RINGING
+from acts.test_utils.tel.tel_defines import VOICEMAIL_DELETE_DIGIT
+from acts.test_utils.tel.tel_defines import WAIT_TIME_1XRTT_VOICE_ATTACH
+from acts.test_utils.tel.tel_defines import WAIT_TIME_ANDROID_STATE_SETTLING
+from acts.test_utils.tel.tel_defines import WAIT_TIME_BETWEEN_STATE_CHECK
+from acts.test_utils.tel.tel_defines import MAX_WAIT_TIME_FOR_STATE_CHANGE
+from acts.test_utils.tel.tel_defines import WAIT_TIME_CHANGE_DATA_SUB_ID
+from acts.test_utils.tel.tel_defines import WAIT_TIME_IN_CALL
+from acts.test_utils.tel.tel_defines import WAIT_TIME_LEAVE_VOICE_MAIL
+from acts.test_utils.tel.tel_defines import WAIT_TIME_REJECT_CALL
+from acts.test_utils.tel.tel_defines import WAIT_TIME_SYNC_DATE_TIME_FROM_NETWORK
+from acts.test_utils.tel.tel_defines import WAIT_TIME_VOICE_MAIL_SERVER_RESPONSE
+from acts.test_utils.tel.tel_defines import WFC_MODE_DISABLED
+from acts.test_utils.tel.tel_defines import WFC_MODE_CELLULAR_PREFERRED
+from acts.test_utils.tel.tel_defines import WFC_MODE_WIFI_ONLY
+from acts.test_utils.tel.tel_defines import WFC_MODE_WIFI_PREFERRED
+from acts.test_utils.tel.tel_defines import TYPE_MOBILE
+from acts.test_utils.tel.tel_defines import TYPE_WIFI
+from acts.test_utils.tel.tel_defines import EventCallStateChanged
+from acts.test_utils.tel.tel_defines import EventActiveDataSubIdChanged
+from acts.test_utils.tel.tel_defines import EventDisplayInfoChanged
+from acts.test_utils.tel.tel_defines import EventConnectivityChanged
+from acts.test_utils.tel.tel_defines import EventDataConnectionStateChanged
+from acts.test_utils.tel.tel_defines import EventDataSmsReceived
+from acts.test_utils.tel.tel_defines import EventMessageWaitingIndicatorChanged
+from acts.test_utils.tel.tel_defines import EventServiceStateChanged
+from acts.test_utils.tel.tel_defines import EventMmsSentFailure
+from acts.test_utils.tel.tel_defines import EventMmsSentSuccess
+from acts.test_utils.tel.tel_defines import EventMmsDownloaded
+from acts.test_utils.tel.tel_defines import EventSmsReceived
+from acts.test_utils.tel.tel_defines import EventSmsDeliverFailure
+from acts.test_utils.tel.tel_defines import EventSmsDeliverSuccess
+from acts.test_utils.tel.tel_defines import EventSmsSentFailure
+from acts.test_utils.tel.tel_defines import EventSmsSentSuccess
+from acts.test_utils.tel.tel_defines import CallStateContainer
+from acts.test_utils.tel.tel_defines import DataConnectionStateContainer
+from acts.test_utils.tel.tel_defines import MessageWaitingIndicatorContainer
+from acts.test_utils.tel.tel_defines import NetworkCallbackContainer
+from acts.test_utils.tel.tel_defines import ServiceStateContainer
+from acts.test_utils.tel.tel_defines import DisplayInfoContainer
+from acts.test_utils.tel.tel_defines import OverrideNetworkContainer
+from acts.test_utils.tel.tel_defines import NETWORK_MODE_NR_LTE_GSM_WCDMA
+from acts.test_utils.tel.tel_defines import CARRIER_VZW, CARRIER_ATT, \
CARRIER_BELL, CARRIER_ROGERS, CARRIER_KOODO, CARRIER_VIDEOTRON, CARRIER_TELUS
-from acts_contrib.test_utils.tel.tel_lookup_tables import connection_type_from_type_string
-from acts_contrib.test_utils.tel.tel_lookup_tables import is_valid_rat
-from acts_contrib.test_utils.tel.tel_lookup_tables import get_allowable_network_preference
-from acts_contrib.test_utils.tel.tel_lookup_tables import get_voice_mail_count_check_function
-from acts_contrib.test_utils.tel.tel_lookup_tables import get_voice_mail_check_number
-from acts_contrib.test_utils.tel.tel_lookup_tables import get_voice_mail_delete_digit
-from acts_contrib.test_utils.tel.tel_lookup_tables import network_preference_for_generation
-from acts_contrib.test_utils.tel.tel_lookup_tables import operator_name_from_network_name
-from acts_contrib.test_utils.tel.tel_lookup_tables import operator_name_from_plmn_id
-from acts_contrib.test_utils.tel.tel_lookup_tables import rat_families_for_network_preference
-from acts_contrib.test_utils.tel.tel_lookup_tables import rat_family_for_generation
-from acts_contrib.test_utils.tel.tel_lookup_tables import rat_family_from_rat
-from acts_contrib.test_utils.tel.tel_lookup_tables import rat_generation_from_rat
-from acts_contrib.test_utils.tel.tel_subscription_utils import get_default_data_sub_id, get_subid_from_slot_index
-from acts_contrib.test_utils.tel.tel_subscription_utils import get_outgoing_message_sub_id
-from acts_contrib.test_utils.tel.tel_subscription_utils import get_outgoing_voice_sub_id
-from acts_contrib.test_utils.tel.tel_subscription_utils import get_incoming_voice_sub_id
-from acts_contrib.test_utils.tel.tel_subscription_utils import get_incoming_message_sub_id
-from acts_contrib.test_utils.tel.tel_subscription_utils import set_subid_for_outgoing_call
-from acts_contrib.test_utils.tel.tel_subscription_utils import set_incoming_voice_sub_id
-from acts_contrib.test_utils.tel.tel_subscription_utils import set_subid_for_message
-from acts_contrib.test_utils.tel.tel_subscription_utils import get_subid_on_same_network_of_host_ad
-from acts_contrib.test_utils.wifi import wifi_test_utils
-from acts_contrib.test_utils.wifi import wifi_constants
+from acts.test_utils.tel.tel_lookup_tables import connection_type_from_type_string
+from acts.test_utils.tel.tel_lookup_tables import is_valid_rat
+from acts.test_utils.tel.tel_lookup_tables import get_allowable_network_preference
+from acts.test_utils.tel.tel_lookup_tables import get_voice_mail_count_check_function
+from acts.test_utils.tel.tel_lookup_tables import get_voice_mail_check_number
+from acts.test_utils.tel.tel_lookup_tables import get_voice_mail_delete_digit
+from acts.test_utils.tel.tel_lookup_tables import network_preference_for_generation
+from acts.test_utils.tel.tel_lookup_tables import operator_name_from_network_name
+from acts.test_utils.tel.tel_lookup_tables import operator_name_from_plmn_id
+from acts.test_utils.tel.tel_lookup_tables import rat_families_for_network_preference
+from acts.test_utils.tel.tel_lookup_tables import rat_family_for_generation
+from acts.test_utils.tel.tel_lookup_tables import rat_family_from_rat
+from acts.test_utils.tel.tel_lookup_tables import rat_generation_from_rat
+from acts.test_utils.tel.tel_subscription_utils import get_default_data_sub_id, get_subid_from_slot_index
+from acts.test_utils.tel.tel_subscription_utils import get_outgoing_message_sub_id
+from acts.test_utils.tel.tel_subscription_utils import get_outgoing_voice_sub_id
+from acts.test_utils.tel.tel_subscription_utils import get_incoming_voice_sub_id
+from acts.test_utils.tel.tel_subscription_utils import get_incoming_message_sub_id
+from acts.test_utils.tel.tel_subscription_utils import set_subid_for_outgoing_call
+from acts.test_utils.tel.tel_subscription_utils import set_incoming_voice_sub_id
+from acts.test_utils.tel.tel_subscription_utils import set_subid_for_message
+from acts.test_utils.tel.tel_subscription_utils import get_subid_on_same_network_of_host_ad
+from acts.test_utils.wifi import wifi_test_utils
+from acts.test_utils.wifi import wifi_constants
from acts.utils import adb_shell_ping
from acts.utils import load_config
from acts.utils import start_standing_subprocess
diff --git a/acts_tests/acts_contrib/test_utils/tel/tel_video_utils.py b/acts/framework/acts/test_utils/tel/tel_video_utils.py
similarity index 87%
rename from acts_tests/acts_contrib/test_utils/tel/tel_video_utils.py
rename to acts/framework/acts/test_utils/tel/tel_video_utils.py
index 85eecd3..a34395a 100644
--- a/acts_tests/acts_contrib/test_utils/tel/tel_video_utils.py
+++ b/acts/framework/acts/test_utils/tel/tel_video_utils.py
@@ -16,65 +16,65 @@
import time
from queue import Empty
-from acts_contrib.test_utils.tel.tel_defines import AUDIO_ROUTE_EARPIECE
-from acts_contrib.test_utils.tel.tel_defines import CALL_STATE_RINGING
-from acts_contrib.test_utils.tel.tel_defines import INCALL_UI_DISPLAY_BACKGROUND
-from acts_contrib.test_utils.tel.tel_defines import INCALL_UI_DISPLAY_FOREGROUND
-from acts_contrib.test_utils.tel.tel_defines import MAX_WAIT_TIME_ACCEPT_CALL_TO_OFFHOOK_EVENT
-from acts_contrib.test_utils.tel.tel_defines import MAX_WAIT_TIME_CALL_INITIATION
-from acts_contrib.test_utils.tel.tel_defines import MAX_WAIT_TIME_CALLEE_RINGING
-from acts_contrib.test_utils.tel.tel_defines import MAX_WAIT_TIME_NW_SELECTION
-from acts_contrib.test_utils.tel.tel_defines import MAX_WAIT_TIME_TELECOM_RINGING
-from acts_contrib.test_utils.tel.tel_defines import MAX_WAIT_TIME_VIDEO_SESSION_EVENT
-from acts_contrib.test_utils.tel.tel_defines import MAX_WAIT_TIME_VOLTE_ENABLED
-from acts_contrib.test_utils.tel.tel_defines import NETWORK_SERVICE_DATA
-from acts_contrib.test_utils.tel.tel_defines import NETWORK_SERVICE_VOICE
-from acts_contrib.test_utils.tel.tel_defines import GEN_4G
-from acts_contrib.test_utils.tel.tel_defines import RAT_1XRTT
-from acts_contrib.test_utils.tel.tel_defines import RAT_IWLAN
-from acts_contrib.test_utils.tel.tel_defines import RAT_LTE
-from acts_contrib.test_utils.tel.tel_defines import RAT_UMTS
-from acts_contrib.test_utils.tel.tel_defines import TELEPHONY_STATE_OFFHOOK
-from acts_contrib.test_utils.tel.tel_defines import TELEPHONY_STATE_RINGING
-from acts_contrib.test_utils.tel.tel_defines import VT_STATE_AUDIO_ONLY
-from acts_contrib.test_utils.tel.tel_defines import VT_STATE_BIDIRECTIONAL
-from acts_contrib.test_utils.tel.tel_defines import VT_STATE_BIDIRECTIONAL_PAUSED
-from acts_contrib.test_utils.tel.tel_defines import VT_STATE_RX_ENABLED
-from acts_contrib.test_utils.tel.tel_defines import VT_STATE_RX_PAUSED
-from acts_contrib.test_utils.tel.tel_defines import VT_STATE_TX_ENABLED
-from acts_contrib.test_utils.tel.tel_defines import VT_STATE_TX_PAUSED
-from acts_contrib.test_utils.tel.tel_defines import VT_STATE_STATE_INVALID
-from acts_contrib.test_utils.tel.tel_defines import VT_VIDEO_QUALITY_DEFAULT
-from acts_contrib.test_utils.tel.tel_defines import WAIT_TIME_ACCEPT_VIDEO_CALL_TO_CHECK_STATE
-from acts_contrib.test_utils.tel.tel_defines import WAIT_TIME_ANDROID_STATE_SETTLING
-from acts_contrib.test_utils.tel.tel_defines import WAIT_TIME_IN_CALL
-from acts_contrib.test_utils.tel.tel_defines import WFC_MODE_DISABLED
-from acts_contrib.test_utils.tel.tel_defines import EventCallStateChanged
-from acts_contrib.test_utils.tel.tel_defines import EventTelecomVideoCallSessionModifyRequestReceived
-from acts_contrib.test_utils.tel.tel_defines import EventTelecomVideoCallSessionModifyResponseReceived
-from acts_contrib.test_utils.tel.tel_defines import EVENT_VIDEO_SESSION_MODIFY_RESPONSE_RECEIVED
-from acts_contrib.test_utils.tel.tel_defines import EVENT_VIDEO_SESSION_MODIFY_REQUEST_RECEIVED
-from acts_contrib.test_utils.tel.tel_defines import CallStateContainer
-from acts_contrib.test_utils.tel.tel_subscription_utils import get_outgoing_voice_sub_id
-from acts_contrib.test_utils.tel.tel_subscription_utils import get_incoming_voice_sub_id
-from acts_contrib.test_utils.tel.tel_test_utils import call_setup_teardown_for_subscription
-from acts_contrib.test_utils.tel.tel_test_utils import ensure_network_generation
-from acts_contrib.test_utils.tel.tel_test_utils import is_event_match
-from acts_contrib.test_utils.tel.tel_test_utils import hangup_call
-from acts_contrib.test_utils.tel.tel_test_utils import initiate_call
-from acts_contrib.test_utils.tel.tel_test_utils import set_wfc_mode
-from acts_contrib.test_utils.tel.tel_test_utils import toggle_airplane_mode
-from acts_contrib.test_utils.tel.tel_test_utils import toggle_volte
-from acts_contrib.test_utils.tel.tel_test_utils import verify_incall_state
-from acts_contrib.test_utils.tel.tel_test_utils import wait_and_answer_call_for_subscription
-from acts_contrib.test_utils.tel.tel_test_utils import wait_for_network_generation
-from acts_contrib.test_utils.tel.tel_test_utils import wait_for_network_rat_for_subscription
-from acts_contrib.test_utils.tel.tel_test_utils import wait_for_ringing_call
-from acts_contrib.test_utils.tel.tel_test_utils import wait_for_telecom_ringing
-from acts_contrib.test_utils.tel.tel_test_utils import wait_for_video_enabled
-from acts_contrib.test_utils.tel.tel_test_utils import get_network_rat
-from acts_contrib.test_utils.tel.tel_test_utils import is_wfc_enabled
-from acts_contrib.test_utils.tel.tel_voice_utils import is_call_hd
+from acts.test_utils.tel.tel_defines import AUDIO_ROUTE_EARPIECE
+from acts.test_utils.tel.tel_defines import CALL_STATE_RINGING
+from acts.test_utils.tel.tel_defines import INCALL_UI_DISPLAY_BACKGROUND
+from acts.test_utils.tel.tel_defines import INCALL_UI_DISPLAY_FOREGROUND
+from acts.test_utils.tel.tel_defines import MAX_WAIT_TIME_ACCEPT_CALL_TO_OFFHOOK_EVENT
+from acts.test_utils.tel.tel_defines import MAX_WAIT_TIME_CALL_INITIATION
+from acts.test_utils.tel.tel_defines import MAX_WAIT_TIME_CALLEE_RINGING
+from acts.test_utils.tel.tel_defines import MAX_WAIT_TIME_NW_SELECTION
+from acts.test_utils.tel.tel_defines import MAX_WAIT_TIME_TELECOM_RINGING
+from acts.test_utils.tel.tel_defines import MAX_WAIT_TIME_VIDEO_SESSION_EVENT
+from acts.test_utils.tel.tel_defines import MAX_WAIT_TIME_VOLTE_ENABLED
+from acts.test_utils.tel.tel_defines import NETWORK_SERVICE_DATA
+from acts.test_utils.tel.tel_defines import NETWORK_SERVICE_VOICE
+from acts.test_utils.tel.tel_defines import GEN_4G
+from acts.test_utils.tel.tel_defines import RAT_1XRTT
+from acts.test_utils.tel.tel_defines import RAT_IWLAN
+from acts.test_utils.tel.tel_defines import RAT_LTE
+from acts.test_utils.tel.tel_defines import RAT_UMTS
+from acts.test_utils.tel.tel_defines import TELEPHONY_STATE_OFFHOOK
+from acts.test_utils.tel.tel_defines import TELEPHONY_STATE_RINGING
+from acts.test_utils.tel.tel_defines import VT_STATE_AUDIO_ONLY
+from acts.test_utils.tel.tel_defines import VT_STATE_BIDIRECTIONAL
+from acts.test_utils.tel.tel_defines import VT_STATE_BIDIRECTIONAL_PAUSED
+from acts.test_utils.tel.tel_defines import VT_STATE_RX_ENABLED
+from acts.test_utils.tel.tel_defines import VT_STATE_RX_PAUSED
+from acts.test_utils.tel.tel_defines import VT_STATE_TX_ENABLED
+from acts.test_utils.tel.tel_defines import VT_STATE_TX_PAUSED
+from acts.test_utils.tel.tel_defines import VT_STATE_STATE_INVALID
+from acts.test_utils.tel.tel_defines import VT_VIDEO_QUALITY_DEFAULT
+from acts.test_utils.tel.tel_defines import WAIT_TIME_ACCEPT_VIDEO_CALL_TO_CHECK_STATE
+from acts.test_utils.tel.tel_defines import WAIT_TIME_ANDROID_STATE_SETTLING
+from acts.test_utils.tel.tel_defines import WAIT_TIME_IN_CALL
+from acts.test_utils.tel.tel_defines import WFC_MODE_DISABLED
+from acts.test_utils.tel.tel_defines import EventCallStateChanged
+from acts.test_utils.tel.tel_defines import EventTelecomVideoCallSessionModifyRequestReceived
+from acts.test_utils.tel.tel_defines import EventTelecomVideoCallSessionModifyResponseReceived
+from acts.test_utils.tel.tel_defines import EVENT_VIDEO_SESSION_MODIFY_RESPONSE_RECEIVED
+from acts.test_utils.tel.tel_defines import EVENT_VIDEO_SESSION_MODIFY_REQUEST_RECEIVED
+from acts.test_utils.tel.tel_defines import CallStateContainer
+from acts.test_utils.tel.tel_subscription_utils import get_outgoing_voice_sub_id
+from acts.test_utils.tel.tel_subscription_utils import get_incoming_voice_sub_id
+from acts.test_utils.tel.tel_test_utils import call_setup_teardown_for_subscription
+from acts.test_utils.tel.tel_test_utils import ensure_network_generation
+from acts.test_utils.tel.tel_test_utils import is_event_match
+from acts.test_utils.tel.tel_test_utils import hangup_call
+from acts.test_utils.tel.tel_test_utils import initiate_call
+from acts.test_utils.tel.tel_test_utils import set_wfc_mode
+from acts.test_utils.tel.tel_test_utils import toggle_airplane_mode
+from acts.test_utils.tel.tel_test_utils import toggle_volte
+from acts.test_utils.tel.tel_test_utils import verify_incall_state
+from acts.test_utils.tel.tel_test_utils import wait_and_answer_call_for_subscription
+from acts.test_utils.tel.tel_test_utils import wait_for_network_generation
+from acts.test_utils.tel.tel_test_utils import wait_for_network_rat_for_subscription
+from acts.test_utils.tel.tel_test_utils import wait_for_ringing_call
+from acts.test_utils.tel.tel_test_utils import wait_for_telecom_ringing
+from acts.test_utils.tel.tel_test_utils import wait_for_video_enabled
+from acts.test_utils.tel.tel_test_utils import get_network_rat
+from acts.test_utils.tel.tel_test_utils import is_wfc_enabled
+from acts.test_utils.tel.tel_voice_utils import is_call_hd
def phone_setup_video(log, ad, wfc_mode=WFC_MODE_DISABLED):
diff --git a/acts_tests/acts_contrib/test_utils/tel/tel_voice_utils.py b/acts/framework/acts/test_utils/tel/tel_voice_utils.py
similarity index 91%
rename from acts_tests/acts_contrib/test_utils/tel/tel_voice_utils.py
rename to acts/framework/acts/test_utils/tel/tel_voice_utils.py
index 7868d86..93fa187 100644
--- a/acts_tests/acts_contrib/test_utils/tel/tel_voice_utils.py
+++ b/acts/framework/acts/test_utils/tel/tel_voice_utils.py
@@ -16,90 +16,90 @@
import time
from acts import signals
-from acts_contrib.test_utils.tel.loggers.protos.telephony_metric_pb2 import TelephonyVoiceTestResult
-from acts_contrib.test_utils.tel.tel_defines import CALL_PROPERTY_HIGH_DEF_AUDIO
-from acts_contrib.test_utils.tel.tel_defines import CALL_STATE_ACTIVE
-from acts_contrib.test_utils.tel.tel_defines import CALL_STATE_HOLDING
-from acts_contrib.test_utils.tel.tel_defines import CAPABILITY_VOLTE
-from acts_contrib.test_utils.tel.tel_defines import CAPABILITY_WFC
-from acts_contrib.test_utils.tel.tel_defines import GEN_2G
-from acts_contrib.test_utils.tel.tel_defines import GEN_3G
-from acts_contrib.test_utils.tel.tel_defines import GEN_4G
-from acts_contrib.test_utils.tel.tel_defines import GEN_5G
-from acts_contrib.test_utils.tel.tel_defines import MAX_WAIT_TIME_NW_SELECTION
-from acts_contrib.test_utils.tel.tel_defines import MAX_WAIT_TIME_VOLTE_ENABLED
-from acts_contrib.test_utils.tel.tel_defines import MAX_WAIT_TIME_WFC_ENABLED
-from acts_contrib.test_utils.tel.tel_defines import NETWORK_SERVICE_DATA
-from acts_contrib.test_utils.tel.tel_defines import NETWORK_SERVICE_VOICE
-from acts_contrib.test_utils.tel.tel_defines import RAT_FAMILY_CDMA2000
-from acts_contrib.test_utils.tel.tel_defines import RAT_FAMILY_LTE
-from acts_contrib.test_utils.tel.tel_defines import RAT_FAMILY_GSM
-from acts_contrib.test_utils.tel.tel_defines import RAT_FAMILY_WCDMA
-from acts_contrib.test_utils.tel.tel_defines import RAT_FAMILY_WLAN
-from acts_contrib.test_utils.tel.tel_defines import RAT_1XRTT
-from acts_contrib.test_utils.tel.tel_defines import RAT_IWLAN
-from acts_contrib.test_utils.tel.tel_defines import RAT_LTE
-from acts_contrib.test_utils.tel.tel_defines import RAT_UMTS
-from acts_contrib.test_utils.tel.tel_defines import WAIT_TIME_BETWEEN_REG_AND_CALL
-from acts_contrib.test_utils.tel.tel_defines import WAIT_TIME_IN_CALL
-from acts_contrib.test_utils.tel.tel_defines import WAIT_TIME_LEAVE_VOICE_MAIL
-from acts_contrib.test_utils.tel.tel_defines import WFC_MODE_DISABLED
-from acts_contrib.test_utils.tel.tel_defines import WFC_MODE_CELLULAR_PREFERRED
-from acts_contrib.test_utils.tel.tel_defines import NETWORK_MODE_CDMA
-from acts_contrib.test_utils.tel.tel_defines import NETWORK_MODE_GSM_ONLY
-from acts_contrib.test_utils.tel.tel_defines import NETWORK_MODE_GSM_UMTS
-from acts_contrib.test_utils.tel.tel_defines import NETWORK_MODE_LTE_CDMA_EVDO
-from acts_contrib.test_utils.tel.tel_defines import NETWORK_MODE_LTE_GSM_WCDMA
-from acts_contrib.test_utils.tel.tel_defines import INVALID_SUB_ID
-from acts_contrib.test_utils.tel.tel_subscription_utils import get_outgoing_message_sub_id
-from acts_contrib.test_utils.tel.tel_subscription_utils import get_outgoing_voice_sub_id
-from acts_contrib.test_utils.tel.tel_subscription_utils import set_subid_for_outgoing_call
-from acts_contrib.test_utils.tel.tel_subscription_utils import get_subid_from_slot_index
-from acts_contrib.test_utils.tel.tel_subscription_utils import get_default_data_sub_id
-from acts_contrib.test_utils.tel.tel_test_utils import call_reject_leave_message
-from acts_contrib.test_utils.tel.tel_test_utils import call_setup_teardown
-from acts_contrib.test_utils.tel.tel_test_utils import call_setup_teardown_for_call_forwarding
-from acts_contrib.test_utils.tel.tel_test_utils import call_setup_teardown_for_call_waiting
-from acts_contrib.test_utils.tel.tel_test_utils import ensure_network_generation
-from acts_contrib.test_utils.tel.tel_test_utils import \
+from acts.test_utils.tel.loggers.protos.telephony_metric_pb2 import TelephonyVoiceTestResult
+from acts.test_utils.tel.tel_defines import CALL_PROPERTY_HIGH_DEF_AUDIO
+from acts.test_utils.tel.tel_defines import CALL_STATE_ACTIVE
+from acts.test_utils.tel.tel_defines import CALL_STATE_HOLDING
+from acts.test_utils.tel.tel_defines import CAPABILITY_VOLTE
+from acts.test_utils.tel.tel_defines import CAPABILITY_WFC
+from acts.test_utils.tel.tel_defines import GEN_2G
+from acts.test_utils.tel.tel_defines import GEN_3G
+from acts.test_utils.tel.tel_defines import GEN_4G
+from acts.test_utils.tel.tel_defines import GEN_5G
+from acts.test_utils.tel.tel_defines import MAX_WAIT_TIME_NW_SELECTION
+from acts.test_utils.tel.tel_defines import MAX_WAIT_TIME_VOLTE_ENABLED
+from acts.test_utils.tel.tel_defines import MAX_WAIT_TIME_WFC_ENABLED
+from acts.test_utils.tel.tel_defines import NETWORK_SERVICE_DATA
+from acts.test_utils.tel.tel_defines import NETWORK_SERVICE_VOICE
+from acts.test_utils.tel.tel_defines import RAT_FAMILY_CDMA2000
+from acts.test_utils.tel.tel_defines import RAT_FAMILY_LTE
+from acts.test_utils.tel.tel_defines import RAT_FAMILY_GSM
+from acts.test_utils.tel.tel_defines import RAT_FAMILY_WCDMA
+from acts.test_utils.tel.tel_defines import RAT_FAMILY_WLAN
+from acts.test_utils.tel.tel_defines import RAT_1XRTT
+from acts.test_utils.tel.tel_defines import RAT_IWLAN
+from acts.test_utils.tel.tel_defines import RAT_LTE
+from acts.test_utils.tel.tel_defines import RAT_UMTS
+from acts.test_utils.tel.tel_defines import WAIT_TIME_BETWEEN_REG_AND_CALL
+from acts.test_utils.tel.tel_defines import WAIT_TIME_IN_CALL
+from acts.test_utils.tel.tel_defines import WAIT_TIME_LEAVE_VOICE_MAIL
+from acts.test_utils.tel.tel_defines import WFC_MODE_DISABLED
+from acts.test_utils.tel.tel_defines import WFC_MODE_CELLULAR_PREFERRED
+from acts.test_utils.tel.tel_defines import NETWORK_MODE_CDMA
+from acts.test_utils.tel.tel_defines import NETWORK_MODE_GSM_ONLY
+from acts.test_utils.tel.tel_defines import NETWORK_MODE_GSM_UMTS
+from acts.test_utils.tel.tel_defines import NETWORK_MODE_LTE_CDMA_EVDO
+from acts.test_utils.tel.tel_defines import NETWORK_MODE_LTE_GSM_WCDMA
+from acts.test_utils.tel.tel_defines import INVALID_SUB_ID
+from acts.test_utils.tel.tel_subscription_utils import get_outgoing_message_sub_id
+from acts.test_utils.tel.tel_subscription_utils import get_outgoing_voice_sub_id
+from acts.test_utils.tel.tel_subscription_utils import set_subid_for_outgoing_call
+from acts.test_utils.tel.tel_subscription_utils import get_subid_from_slot_index
+from acts.test_utils.tel.tel_subscription_utils import get_default_data_sub_id
+from acts.test_utils.tel.tel_test_utils import call_reject_leave_message
+from acts.test_utils.tel.tel_test_utils import call_setup_teardown
+from acts.test_utils.tel.tel_test_utils import call_setup_teardown_for_call_forwarding
+from acts.test_utils.tel.tel_test_utils import call_setup_teardown_for_call_waiting
+from acts.test_utils.tel.tel_test_utils import ensure_network_generation
+from acts.test_utils.tel.tel_test_utils import \
ensure_network_generation_for_subscription
-from acts_contrib.test_utils.tel.tel_test_utils import \
+from acts.test_utils.tel.tel_test_utils import \
ensure_network_rat_for_subscription
-from acts_contrib.test_utils.tel.tel_test_utils import ensure_phones_idle
-from acts_contrib.test_utils.tel.tel_test_utils import ensure_wifi_connected
-from acts_contrib.test_utils.tel.tel_test_utils import get_network_gen_for_subscription
-from acts_contrib.test_utils.tel.tel_test_utils import get_network_rat
-from acts_contrib.test_utils.tel.tel_test_utils import get_network_rat_for_subscription
-from acts_contrib.test_utils.tel.tel_test_utils import get_telephony_signal_strength
-from acts_contrib.test_utils.tel.tel_test_utils import is_wfc_enabled
-from acts_contrib.test_utils.tel.tel_test_utils import \
+from acts.test_utils.tel.tel_test_utils import ensure_phones_idle
+from acts.test_utils.tel.tel_test_utils import ensure_wifi_connected
+from acts.test_utils.tel.tel_test_utils import get_network_gen_for_subscription
+from acts.test_utils.tel.tel_test_utils import get_network_rat
+from acts.test_utils.tel.tel_test_utils import get_network_rat_for_subscription
+from acts.test_utils.tel.tel_test_utils import get_telephony_signal_strength
+from acts.test_utils.tel.tel_test_utils import is_wfc_enabled
+from acts.test_utils.tel.tel_test_utils import \
reset_preferred_network_type_to_allowable_range
-from acts_contrib.test_utils.tel.tel_test_utils import set_wfc_mode
-from acts_contrib.test_utils.tel.tel_test_utils import set_wifi_to_default
-from acts_contrib.test_utils.tel.tel_test_utils import TelResultWrapper
-from acts_contrib.test_utils.tel.tel_test_utils import toggle_airplane_mode
-from acts_contrib.test_utils.tel.tel_test_utils import toggle_volte
-from acts_contrib.test_utils.tel.tel_test_utils import toggle_volte_for_subscription
-from acts_contrib.test_utils.tel.tel_test_utils import verify_incall_state
-from acts_contrib.test_utils.tel.tel_test_utils import verify_internet_connection
-from acts_contrib.test_utils.tel.tel_test_utils import \
+from acts.test_utils.tel.tel_test_utils import set_wfc_mode
+from acts.test_utils.tel.tel_test_utils import set_wifi_to_default
+from acts.test_utils.tel.tel_test_utils import TelResultWrapper
+from acts.test_utils.tel.tel_test_utils import toggle_airplane_mode
+from acts.test_utils.tel.tel_test_utils import toggle_volte
+from acts.test_utils.tel.tel_test_utils import toggle_volte_for_subscription
+from acts.test_utils.tel.tel_test_utils import verify_incall_state
+from acts.test_utils.tel.tel_test_utils import verify_internet_connection
+from acts.test_utils.tel.tel_test_utils import \
wait_for_data_attach_for_subscription
-from acts_contrib.test_utils.tel.tel_test_utils import wait_for_enhanced_4g_lte_setting
-from acts_contrib.test_utils.tel.tel_test_utils import wait_for_network_generation
-from acts_contrib.test_utils.tel.tel_test_utils import \
+from acts.test_utils.tel.tel_test_utils import wait_for_enhanced_4g_lte_setting
+from acts.test_utils.tel.tel_test_utils import wait_for_network_generation
+from acts.test_utils.tel.tel_test_utils import \
wait_for_network_generation_for_subscription
-from acts_contrib.test_utils.tel.tel_test_utils import wait_for_not_network_rat
-from acts_contrib.test_utils.tel.tel_test_utils import wait_for_network_rat
-from acts_contrib.test_utils.tel.tel_test_utils import \
+from acts.test_utils.tel.tel_test_utils import wait_for_not_network_rat
+from acts.test_utils.tel.tel_test_utils import wait_for_network_rat
+from acts.test_utils.tel.tel_test_utils import \
wait_for_network_rat_for_subscription
-from acts_contrib.test_utils.tel.tel_test_utils import \
+from acts.test_utils.tel.tel_test_utils import \
wait_for_not_network_rat_for_subscription
-from acts_contrib.test_utils.tel.tel_test_utils import wait_for_volte_enabled
-from acts_contrib.test_utils.tel.tel_test_utils import \
+from acts.test_utils.tel.tel_test_utils import wait_for_volte_enabled
+from acts.test_utils.tel.tel_test_utils import \
wait_for_voice_attach_for_subscription
-from acts_contrib.test_utils.tel.tel_test_utils import wait_for_wfc_enabled
-from acts_contrib.test_utils.tel.tel_test_utils import wait_for_wfc_disabled
-from acts_contrib.test_utils.tel.tel_test_utils import get_capability_for_subscription
+from acts.test_utils.tel.tel_test_utils import wait_for_wfc_enabled
+from acts.test_utils.tel.tel_test_utils import wait_for_wfc_disabled
+from acts.test_utils.tel.tel_test_utils import get_capability_for_subscription
CallResult = TelephonyVoiceTestResult.CallResult.Value
diff --git a/acts_tests/acts_contrib/test_utils/tel/twilio_client.py b/acts/framework/acts/test_utils/tel/twilio_client.py
similarity index 100%
rename from acts_tests/acts_contrib/test_utils/tel/twilio_client.py
rename to acts/framework/acts/test_utils/tel/twilio_client.py
diff --git a/acts_tests/acts_contrib/test_utils/users/__init__.py b/acts/framework/acts/test_utils/users/__init__.py
similarity index 100%
rename from acts_tests/acts_contrib/test_utils/users/__init__.py
rename to acts/framework/acts/test_utils/users/__init__.py
diff --git a/acts_tests/acts_contrib/test_utils/users/users.py b/acts/framework/acts/test_utils/users/users.py
similarity index 100%
rename from acts_tests/acts_contrib/test_utils/users/users.py
rename to acts/framework/acts/test_utils/users/users.py
diff --git a/acts_tests/acts_contrib/test_utils/wifi/OWNERS b/acts/framework/acts/test_utils/wifi/OWNERS
similarity index 100%
rename from acts_tests/acts_contrib/test_utils/wifi/OWNERS
rename to acts/framework/acts/test_utils/wifi/OWNERS
diff --git a/acts_tests/acts_contrib/test_utils/wifi/RttPostFlightTest.py b/acts/framework/acts/test_utils/wifi/RttPostFlightTest.py
similarity index 88%
rename from acts_tests/acts_contrib/test_utils/wifi/RttPostFlightTest.py
rename to acts/framework/acts/test_utils/wifi/RttPostFlightTest.py
index b058a07..cfc7c05 100644
--- a/acts_tests/acts_contrib/test_utils/wifi/RttPostFlightTest.py
+++ b/acts/framework/acts/test_utils/wifi/RttPostFlightTest.py
@@ -15,10 +15,10 @@
# limitations under the License.
import time
-import acts_contrib.test_utils.wifi.rpm_controller_utils as rutils
-import acts_contrib.test_utils.wifi.wifi_test_utils as wutils
+import acts.test_utils.wifi.rpm_controller_utils as rutils
+import acts.test_utils.wifi.wifi_test_utils as wutils
from acts import asserts
-from acts_contrib.test_utils.wifi.WifiBaseTest import WifiBaseTest
+from acts.test_utils.wifi.WifiBaseTest import WifiBaseTest
SSID = "DO_NOT_CONNECT"
TIMEOUT = 60
diff --git a/acts_tests/acts_contrib/test_utils/wifi/RttPreFlightTest.py b/acts/framework/acts/test_utils/wifi/RttPreFlightTest.py
similarity index 88%
rename from acts_tests/acts_contrib/test_utils/wifi/RttPreFlightTest.py
rename to acts/framework/acts/test_utils/wifi/RttPreFlightTest.py
index db87976..bf21357 100644
--- a/acts_tests/acts_contrib/test_utils/wifi/RttPreFlightTest.py
+++ b/acts/framework/acts/test_utils/wifi/RttPreFlightTest.py
@@ -15,10 +15,10 @@
# limitations under the License.
import time
-import acts_contrib.test_utils.wifi.rpm_controller_utils as rutils
-import acts_contrib.test_utils.wifi.wifi_test_utils as wutils
+import acts.test_utils.wifi.rpm_controller_utils as rutils
+import acts.test_utils.wifi.wifi_test_utils as wutils
from acts import asserts
-from acts_contrib.test_utils.wifi.WifiBaseTest import WifiBaseTest
+from acts.test_utils.wifi.WifiBaseTest import WifiBaseTest
SSID = "DO_NOT_CONNECT"
TIMEOUT = 60
diff --git a/acts_tests/acts_contrib/test_utils/wifi/WifiBaseTest.py b/acts/framework/acts/test_utils/wifi/WifiBaseTest.py
similarity index 99%
rename from acts_tests/acts_contrib/test_utils/wifi/WifiBaseTest.py
rename to acts/framework/acts/test_utils/wifi/WifiBaseTest.py
index 897868f..2fb7d37 100644
--- a/acts_tests/acts_contrib/test_utils/wifi/WifiBaseTest.py
+++ b/acts/framework/acts/test_utils/wifi/WifiBaseTest.py
@@ -36,8 +36,8 @@
from acts.controllers.ap_lib import hostapd_constants
from acts.controllers.ap_lib import hostapd_security
from acts.keys import Config
-from acts_contrib.test_utils.net import net_test_utils as nutils
-from acts_contrib.test_utils.wifi import wifi_test_utils as wutils
+from acts.test_utils.net import net_test_utils as nutils
+from acts.test_utils.wifi import wifi_test_utils as wutils
AP_1 = 0
AP_2 = 1
diff --git a/acts_tests/acts_contrib/test_utils/wifi/__init__.py b/acts/framework/acts/test_utils/wifi/__init__.py
similarity index 100%
rename from acts_tests/acts_contrib/test_utils/wifi/__init__.py
rename to acts/framework/acts/test_utils/wifi/__init__.py
diff --git a/acts_tests/acts_contrib/test_utils/wifi/aware/AwareBaseTest.py b/acts/framework/acts/test_utils/wifi/aware/AwareBaseTest.py
similarity index 95%
rename from acts_tests/acts_contrib/test_utils/wifi/aware/AwareBaseTest.py
rename to acts/framework/acts/test_utils/wifi/aware/AwareBaseTest.py
index c0c1075..42287aa 100644
--- a/acts_tests/acts_contrib/test_utils/wifi/aware/AwareBaseTest.py
+++ b/acts/framework/acts/test_utils/wifi/aware/AwareBaseTest.py
@@ -20,10 +20,10 @@
from acts import utils
from acts.base_test import BaseTestClass
from acts.keys import Config
-from acts_contrib.test_utils.net import net_test_utils as nutils
-from acts_contrib.test_utils.wifi import wifi_test_utils as wutils
-from acts_contrib.test_utils.wifi.aware import aware_const as aconsts
-from acts_contrib.test_utils.wifi.aware import aware_test_utils as autils
+from acts.test_utils.net import net_test_utils as nutils
+from acts.test_utils.wifi import wifi_test_utils as wutils
+from acts.test_utils.wifi.aware import aware_const as aconsts
+from acts.test_utils.wifi.aware import aware_test_utils as autils
class AwareBaseTest(BaseTestClass):
diff --git a/acts_tests/acts_contrib/test_utils/wifi/aware/__init__.py b/acts/framework/acts/test_utils/wifi/aware/__init__.py
similarity index 100%
rename from acts_tests/acts_contrib/test_utils/wifi/aware/__init__.py
rename to acts/framework/acts/test_utils/wifi/aware/__init__.py
diff --git a/acts_tests/acts_contrib/test_utils/wifi/aware/aware_const.py b/acts/framework/acts/test_utils/wifi/aware/aware_const.py
similarity index 100%
rename from acts_tests/acts_contrib/test_utils/wifi/aware/aware_const.py
rename to acts/framework/acts/test_utils/wifi/aware/aware_const.py
diff --git a/acts_tests/acts_contrib/test_utils/wifi/aware/aware_test_utils.py b/acts/framework/acts/test_utils/wifi/aware/aware_test_utils.py
similarity index 99%
rename from acts_tests/acts_contrib/test_utils/wifi/aware/aware_test_utils.py
rename to acts/framework/acts/test_utils/wifi/aware/aware_test_utils.py
index 78d3be7..5a71330 100644
--- a/acts_tests/acts_contrib/test_utils/wifi/aware/aware_test_utils.py
+++ b/acts/framework/acts/test_utils/wifi/aware/aware_test_utils.py
@@ -22,9 +22,9 @@
import time
from acts import asserts
-from acts_contrib.test_utils.net import connectivity_const as cconsts
-from acts_contrib.test_utils.net import socket_test_utils as sutils
-from acts_contrib.test_utils.wifi.aware import aware_const as aconsts
+from acts.test_utils.net import connectivity_const as cconsts
+from acts.test_utils.net import socket_test_utils as sutils
+from acts.test_utils.wifi.aware import aware_const as aconsts
# arbitrary timeout for events
EVENT_TIMEOUT = 10
diff --git a/acts_tests/acts_contrib/test_utils/wifi/ota_chamber.py b/acts/framework/acts/test_utils/wifi/ota_chamber.py
similarity index 100%
rename from acts_tests/acts_contrib/test_utils/wifi/ota_chamber.py
rename to acts/framework/acts/test_utils/wifi/ota_chamber.py
diff --git a/acts_tests/acts_contrib/test_utils/wifi/ota_sniffer.py b/acts/framework/acts/test_utils/wifi/ota_sniffer.py
similarity index 99%
rename from acts_tests/acts_contrib/test_utils/wifi/ota_sniffer.py
rename to acts/framework/acts/test_utils/wifi/ota_sniffer.py
index 73fb033..e5f2843 100644
--- a/acts_tests/acts_contrib/test_utils/wifi/ota_sniffer.py
+++ b/acts/framework/acts/test_utils/wifi/ota_sniffer.py
@@ -18,7 +18,7 @@
import os
import posixpath
import time
-import acts_contrib.test_utils.wifi.wifi_test_utils as wutils
+import acts.test_utils.wifi.wifi_test_utils as wutils
from acts import context
from acts import logger
diff --git a/acts_tests/acts_contrib/test_utils/wifi/p2p/WifiP2pBaseTest.py b/acts/framework/acts/test_utils/wifi/p2p/WifiP2pBaseTest.py
similarity index 96%
rename from acts_tests/acts_contrib/test_utils/wifi/p2p/WifiP2pBaseTest.py
rename to acts/framework/acts/test_utils/wifi/p2p/WifiP2pBaseTest.py
index c0b18ae..3573128 100644
--- a/acts_tests/acts_contrib/test_utils/wifi/p2p/WifiP2pBaseTest.py
+++ b/acts/framework/acts/test_utils/wifi/p2p/WifiP2pBaseTest.py
@@ -23,9 +23,9 @@
from acts import utils
from acts.base_test import BaseTestClass
from acts.keys import Config
-from acts_contrib.test_utils.net import net_test_utils as nutils
-from acts_contrib.test_utils.wifi import wifi_test_utils as wutils
-from acts_contrib.test_utils.wifi.p2p import wifi_p2p_const as p2pconsts
+from acts.test_utils.net import net_test_utils as nutils
+from acts.test_utils.wifi import wifi_test_utils as wutils
+from acts.test_utils.wifi.p2p import wifi_p2p_const as p2pconsts
WAIT_TIME = 60
diff --git a/acts_tests/acts_contrib/test_utils/wifi/p2p/__init__.py b/acts/framework/acts/test_utils/wifi/p2p/__init__.py
similarity index 100%
rename from acts_tests/acts_contrib/test_utils/wifi/p2p/__init__.py
rename to acts/framework/acts/test_utils/wifi/p2p/__init__.py
diff --git a/acts_tests/acts_contrib/test_utils/wifi/p2p/wifi_p2p_const.py b/acts/framework/acts/test_utils/wifi/p2p/wifi_p2p_const.py
similarity index 100%
rename from acts_tests/acts_contrib/test_utils/wifi/p2p/wifi_p2p_const.py
rename to acts/framework/acts/test_utils/wifi/p2p/wifi_p2p_const.py
diff --git a/acts_tests/acts_contrib/test_utils/wifi/p2p/wifi_p2p_test_utils.py b/acts/framework/acts/test_utils/wifi/p2p/wifi_p2p_test_utils.py
similarity index 99%
rename from acts_tests/acts_contrib/test_utils/wifi/p2p/wifi_p2p_test_utils.py
rename to acts/framework/acts/test_utils/wifi/p2p/wifi_p2p_test_utils.py
index 38efd32..e0bf921 100755
--- a/acts_tests/acts_contrib/test_utils/wifi/p2p/wifi_p2p_test_utils.py
+++ b/acts/framework/acts/test_utils/wifi/p2p/wifi_p2p_test_utils.py
@@ -22,7 +22,7 @@
from acts import asserts
from acts import utils
-from acts_contrib.test_utils.wifi.p2p import wifi_p2p_const as p2pconsts
+from acts.test_utils.wifi.p2p import wifi_p2p_const as p2pconsts
import acts.utils
diff --git a/acts_tests/acts_contrib/test_utils/wifi/rpm_controller_utils.py b/acts/framework/acts/test_utils/wifi/rpm_controller_utils.py
similarity index 100%
rename from acts_tests/acts_contrib/test_utils/wifi/rpm_controller_utils.py
rename to acts/framework/acts/test_utils/wifi/rpm_controller_utils.py
diff --git a/acts_tests/acts_contrib/test_utils/wifi/rtt/RttBaseTest.py b/acts/framework/acts/test_utils/wifi/rtt/RttBaseTest.py
similarity index 94%
rename from acts_tests/acts_contrib/test_utils/wifi/rtt/RttBaseTest.py
rename to acts/framework/acts/test_utils/wifi/rtt/RttBaseTest.py
index bb58b02..90c87bd 100644
--- a/acts_tests/acts_contrib/test_utils/wifi/rtt/RttBaseTest.py
+++ b/acts/framework/acts/test_utils/wifi/rtt/RttBaseTest.py
@@ -20,10 +20,10 @@
from acts import utils
from acts.base_test import BaseTestClass
from acts.keys import Config
-from acts_contrib.test_utils.net import net_test_utils as nutils
-from acts_contrib.test_utils.wifi import wifi_test_utils as wutils
-from acts_contrib.test_utils.wifi.rtt import rtt_const as rconsts
-from acts_contrib.test_utils.wifi.rtt import rtt_test_utils as rutils
+from acts.test_utils.net import net_test_utils as nutils
+from acts.test_utils.wifi import wifi_test_utils as wutils
+from acts.test_utils.wifi.rtt import rtt_const as rconsts
+from acts.test_utils.wifi.rtt import rtt_test_utils as rutils
class RttBaseTest(BaseTestClass):
diff --git a/acts_tests/acts_contrib/test_utils/wifi/rtt/__init__.py b/acts/framework/acts/test_utils/wifi/rtt/__init__.py
similarity index 100%
rename from acts_tests/acts_contrib/test_utils/wifi/rtt/__init__.py
rename to acts/framework/acts/test_utils/wifi/rtt/__init__.py
diff --git a/acts_tests/acts_contrib/test_utils/wifi/rtt/rtt_const.py b/acts/framework/acts/test_utils/wifi/rtt/rtt_const.py
similarity index 100%
rename from acts_tests/acts_contrib/test_utils/wifi/rtt/rtt_const.py
rename to acts/framework/acts/test_utils/wifi/rtt/rtt_const.py
diff --git a/acts_tests/acts_contrib/test_utils/wifi/rtt/rtt_test_utils.py b/acts/framework/acts/test_utils/wifi/rtt/rtt_test_utils.py
similarity index 98%
rename from acts_tests/acts_contrib/test_utils/wifi/rtt/rtt_test_utils.py
rename to acts/framework/acts/test_utils/wifi/rtt/rtt_test_utils.py
index eac7378..013e7f6 100644
--- a/acts_tests/acts_contrib/test_utils/wifi/rtt/rtt_test_utils.py
+++ b/acts/framework/acts/test_utils/wifi/rtt/rtt_test_utils.py
@@ -20,8 +20,8 @@
import time
from acts import asserts
-from acts_contrib.test_utils.wifi import wifi_test_utils as wutils
-from acts_contrib.test_utils.wifi.rtt import rtt_const as rconsts
+from acts.test_utils.wifi import wifi_test_utils as wutils
+from acts.test_utils.wifi.rtt import rtt_const as rconsts
# arbitrary timeout for events
EVENT_TIMEOUT = 15
diff --git a/acts_tests/acts_contrib/test_utils/wifi/wifi_constants.py b/acts/framework/acts/test_utils/wifi/wifi_constants.py
similarity index 100%
rename from acts_tests/acts_contrib/test_utils/wifi/wifi_constants.py
rename to acts/framework/acts/test_utils/wifi/wifi_constants.py
diff --git a/acts_tests/acts_contrib/test_utils/wifi/wifi_datastore_utils.py b/acts/framework/acts/test_utils/wifi/wifi_datastore_utils.py
similarity index 98%
rename from acts_tests/acts_contrib/test_utils/wifi/wifi_datastore_utils.py
rename to acts/framework/acts/test_utils/wifi/wifi_datastore_utils.py
index a79ff77..44532d7 100755
--- a/acts_tests/acts_contrib/test_utils/wifi/wifi_datastore_utils.py
+++ b/acts/framework/acts/test_utils/wifi/wifi_datastore_utils.py
@@ -23,7 +23,7 @@
from acts import asserts
from acts import signals
from acts import utils
-from acts_contrib.test_utils.wifi import wifi_constants
+from acts.test_utils.wifi import wifi_constants
"""This file consists of all the helper methods needed to interact with the
Datastore @ https://chaos-188802.appspot.com/ used for Android Interop
diff --git a/acts_tests/acts_contrib/test_utils/wifi/wifi_performance_test_utils.py b/acts/framework/acts/test_utils/wifi/wifi_performance_test_utils.py
similarity index 99%
rename from acts_tests/acts_contrib/test_utils/wifi/wifi_performance_test_utils.py
rename to acts/framework/acts/test_utils/wifi/wifi_performance_test_utils.py
index edaf75c..491702b 100644
--- a/acts_tests/acts_contrib/test_utils/wifi/wifi_performance_test_utils.py
+++ b/acts/framework/acts/test_utils/wifi/wifi_performance_test_utils.py
@@ -28,7 +28,7 @@
from acts.controllers.android_device import AndroidDevice
from acts.controllers.utils_lib import ssh
from acts import utils
-from acts_contrib.test_utils.wifi import wifi_test_utils as wutils
+from acts.test_utils.wifi import wifi_test_utils as wutils
from concurrent.futures import ThreadPoolExecutor
SHORT_SLEEP = 1
diff --git a/acts_tests/acts_contrib/test_utils/wifi/wifi_power_test_utils.py b/acts/framework/acts/test_utils/wifi/wifi_power_test_utils.py
similarity index 98%
rename from acts_tests/acts_contrib/test_utils/wifi/wifi_power_test_utils.py
rename to acts/framework/acts/test_utils/wifi/wifi_power_test_utils.py
index b1565d2..6e6ca85 100644
--- a/acts_tests/acts_contrib/test_utils/wifi/wifi_power_test_utils.py
+++ b/acts/framework/acts/test_utils/wifi/wifi_power_test_utils.py
@@ -19,7 +19,7 @@
from acts import utils
from acts.libs.proc import job
from acts.controllers.ap_lib import bridge_interface as bi
-from acts_contrib.test_utils.wifi import wifi_test_utils as wutils
+from acts.test_utils.wifi import wifi_test_utils as wutils
from acts.controllers.ap_lib import hostapd_security
from acts.controllers.ap_lib import hostapd_ap_preset
diff --git a/acts_tests/acts_contrib/test_utils/wifi/wifi_retail_ap.py b/acts/framework/acts/test_utils/wifi/wifi_retail_ap.py
similarity index 100%
rename from acts_tests/acts_contrib/test_utils/wifi/wifi_retail_ap.py
rename to acts/framework/acts/test_utils/wifi/wifi_retail_ap.py
diff --git a/acts_tests/acts_contrib/test_utils/wifi/wifi_test_utils.py b/acts/framework/acts/test_utils/wifi/wifi_test_utils.py
similarity index 99%
rename from acts_tests/acts_contrib/test_utils/wifi/wifi_test_utils.py
rename to acts/framework/acts/test_utils/wifi/wifi_test_utils.py
index e813f57..89769b4 100755
--- a/acts_tests/acts_contrib/test_utils/wifi/wifi_test_utils.py
+++ b/acts/framework/acts/test_utils/wifi/wifi_test_utils.py
@@ -33,8 +33,8 @@
from acts.controllers.ap_lib import hostapd_ap_preset
from acts.controllers.ap_lib.hostapd_constants import BAND_2G
from acts.controllers.ap_lib.hostapd_constants import BAND_5G
-from acts_contrib.test_utils.wifi import wifi_constants
-from acts_contrib.test_utils.tel import tel_defines
+from acts.test_utils.wifi import wifi_constants
+from acts.test_utils.tel import tel_defines
# Default timeout used for reboot, toggle WiFi and Airplane mode,
# for the system to settle down after the operation.
diff --git a/acts/framework/tests/Sl4aSanityTest.py b/acts/framework/tests/Sl4aSanityTest.py
index 195b7ac..a88272f 100644
--- a/acts/framework/tests/Sl4aSanityTest.py
+++ b/acts/framework/tests/Sl4aSanityTest.py
@@ -14,7 +14,10 @@
# License for the specific language governing permissions and limitations under
# the License.
+from queue import Empty
from acts.base_test import BaseTestClass
+from acts.test_utils.wifi.wifi_test_utils import wifi_toggle_state
+from acts.test_utils.wifi.wifi_test_utils import WifiEnums
class Sl4aSanityTest(BaseTestClass):
@@ -43,3 +46,10 @@
self.log.info("Iteration %d, starting." % i)
droid, ed = ad.get_droid()
return True
+
+ def test_message_then_shutdown_stress(self):
+ ad = self.android_devices[0]
+ for i in range(10):
+ assert wifi_toggle_state(ad.droid, ad.ed, False)
+ assert wifi_toggle_state(ad.droid, ad.ed, True)
+ return True
diff --git a/acts/framework/tests/acts_import_test_utils_test.py b/acts/framework/tests/acts_import_test_utils_test.py
new file mode 100755
index 0000000..c44522c
--- /dev/null
+++ b/acts/framework/tests/acts_import_test_utils_test.py
@@ -0,0 +1,70 @@
+#!/usr/bin/env python3
+#
+# Copyright 2016 - The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import unittest
+
+
+class ActsImportTestUtilsTest(unittest.TestCase):
+ """This test class has unit tests for the implementation of everything
+ under acts.test_utils.*
+ """
+
+ def test_import_successful(self):
+ """ Test to return true if all imports were successful.
+
+ This test will fail if any import was unsuccessful.
+ """
+ try:
+ from acts import utils
+
+ from acts.test_utils.bt import BleEnum
+ from acts.test_utils.bt import BluetoothBaseTest
+ from acts.test_utils.bt import BluetoothCarHfpBaseTest
+ from acts.test_utils.bt import BtEnum
+ from acts.test_utils.bt import GattConnectedBaseTest
+ from acts.test_utils.bt import GattEnum
+ from acts.test_utils.bt import bt_contacts_utils
+ from acts.test_utils.bt import bt_gatt_utils
+ from acts.test_utils.bt import bt_test_utils
+ from acts.test_utils.bt import native_bt_test_utils
+
+ from acts.test_utils.car import car_bt_utils
+ from acts.test_utils.car import car_media_utils
+ from acts.test_utils.car import car_telecom_utils
+ from acts.test_utils.car import tel_telecom_utils
+
+ from acts.test_utils.net import connectivity_const
+ from acts.test_utils.net import connectivity_const
+
+ from acts.test_utils.tel import TelephonyBaseTest
+ from acts.test_utils.tel import tel_atten_utils
+ from acts.test_utils.tel import tel_data_utils
+ from acts.test_utils.tel import tel_defines
+ from acts.test_utils.tel import tel_lookup_tables
+ from acts.test_utils.tel import tel_subscription_utils
+ from acts.test_utils.tel import tel_test_utils
+ from acts.test_utils.tel import tel_video_utils
+ from acts.test_utils.tel import tel_voice_utils
+
+ from acts.test_utils.wifi import wifi_constants
+ from acts.test_utils.wifi import wifi_test_utils
+
+ except Exception:
+ self.fail('Unable to import all supported test_utils')
+
+
+if __name__ == '__main__':
+ unittest.main()
diff --git a/acts/framework/tests/acts_import_unit_test.py b/acts/framework/tests/acts_import_unit_test.py
index 4c2ab8d..1d1ac75 100755
--- a/acts/framework/tests/acts_import_unit_test.py
+++ b/acts/framework/tests/acts_import_unit_test.py
@@ -52,11 +52,52 @@
'acts/controllers/native.py',
'acts/controllers/native_android_device.py',
'acts/controllers/packet_sender.py',
- 'acts/controllers/buds_lib/dev_utils/proto/gen/nanopb_pb2.py'
+ 'acts/test_utils/wifi/ota_chamber.py',
+ 'acts/controllers/buds_lib/dev_utils/proto/gen/nanopb_pb2.py',
+ 'acts/test_utils/wifi/wifi_performance_test_utils.py',
+ 'acts/test_utils/wifi/wifi_power_test_utils.py',
+ 'acts/test_utils/wifi/wifi_retail_ap.py',
+ 'acts/test_utils/bt/bt_power_test_utils.py',
+ 'acts/test_utils/coex/coex_test_utils.py',
+ 'acts/test_utils/tel/twilio_client.py',
+ 'tests/google/ble/beacon_tests/BeaconSwarmTest.py',
+ 'tests/google/bt/pts/BtCmdLineTest.py',
+ 'tests/google/bt/performance/BtA2dpOtaRangeTest.py',
+ 'tests/google/bt/headphone_automation/SineWaveQualityTest.py',
+ 'tests/google/bt/audio_lab/BtChameleonTest.py',
+ 'tests/google/native/bt/BtNativeTest.py',
+ 'tests/google/wifi/WifiRvrTest.py',
+ 'tests/google/wifi/WifiStaApConcurrencyStressTest.py',
+ 'tests/google/wifi/WifiPasspointTest.py',
+ 'tests/google/wifi/WifiOtaTest.py',
+ 'tests/google/wifi/WifiRoamingPerformanceTest.py',
+ 'tests/google/wifi/WifiRssiTest.py',
+ 'tests/google/wifi/WifiPerformancePreflightTest.py',
+ 'tests/google/wifi/WifiPingTest.py',
+ 'tests/google/wifi/WifiThroughputStabilityTest.py',
+ 'tests/google/wifi/WifiSensitivityTest.py',
+ 'tests/google/wifi/WifiSoftApPerformanceTest.py',
+ 'tests/google/tel/live/TelLiveMobilityStressTest.py',
+ 'tests/google/tel/live/TelLiveNoSimTest.py',
+ 'tests/google/tel/live/TelLiveLockedSimTest.py',
+ 'tests/google/tel/live/TelLiveEmergencyTest.py',
+ 'tests/google/tel/live/TelLiveConnectivityMonitorTest.py',
+ 'tests/google/tel/live/TelLiveConnectivityMonitorMobilityTest.py',
+ 'acts/test_utils/gnss/gnss_testlog_utils.py',
]
DENYLIST_DIRECTORIES = [
- 'acts/controllers/buds_lib'
+ 'acts/controllers/buds_lib',
+ 'acts/test_utils/audio_analysis_lib/',
+ 'acts/test_utils/coex/',
+ 'acts/test_utils/power/',
+ 'acts/test_utils/bt/',
+ 'tests/google/coex/',
+ 'tests/google/gnss/',
+ 'tests/google/power/',
+ 'tests/google/bt/performance/',
+ 'tests/google/bt/sar/',
+ 'tests/google/fuchsia/'
]
BANNED_IMPORTS = ['mobly.controllers']
@@ -70,30 +111,32 @@
acts = import_acts()
self.assertIsNotNone(acts)
- def test_import_framework_successful(self):
- """Dynamically test all imports from the framework.
+ def test_import_framework_and_tests_successful(self):
+ """Dynamically test all imports from the framework and ACTS tests.
Ensure that no imports of banned packages/modules took place."""
acts = import_acts()
if hasattr(acts, '__path__') and len(acts.__path__) > 0:
acts_path = acts.__path__[0]
else:
acts_path = os.path.dirname(acts.__file__)
+ tests_path = os.path.normpath(os.path.join(acts_path, '../../tests'))
- for root, _, files in os.walk(acts_path):
- for f in files:
- full_path = os.path.join(root, f)
- if (any(full_path.endswith(e) for e in DENYLIST)
- or any(e in full_path
- for e in DENYLIST_DIRECTORIES)):
- continue
+ for base_dir in [acts_path, tests_path]:
+ for root, _, files in os.walk(base_dir):
+ for f in files:
+ full_path = os.path.join(root, f)
+ if (any(full_path.endswith(e) for e in DENYLIST)
+ or any(e in full_path
+ for e in DENYLIST_DIRECTORIES)):
+ continue
- path = os.path.relpath(os.path.join(root, f), os.getcwd())
+ path = os.path.relpath(os.path.join(root, f), os.getcwd())
- if PY_FILE_REGEX.match(full_path):
- with self.subTest(msg='import %s' % path):
- fake_module_name = str(uuid.uuid4())
- module = import_module(fake_module_name, path)
- self.assertIsNotNone(module)
+ if PY_FILE_REGEX.match(full_path):
+ with self.subTest(msg='import %s' % path):
+ fake_module_name = str(uuid.uuid4())
+ module = import_module(fake_module_name, path)
+ self.assertIsNotNone(module)
# Suppress verbose output on assertion failure.
self.longMessage = False
diff --git a/acts_tests/acts_contrib/test_utils_tests/audio_analysis_integrationtest.py b/acts/framework/tests/audio_analysis_integrationtest.py
similarity index 97%
rename from acts_tests/acts_contrib/test_utils_tests/audio_analysis_integrationtest.py
rename to acts/framework/tests/audio_analysis_integrationtest.py
index a00a431..b41e662 100644
--- a/acts_tests/acts_contrib/test_utils_tests/audio_analysis_integrationtest.py
+++ b/acts/framework/tests/audio_analysis_integrationtest.py
@@ -26,8 +26,8 @@
import mock
sys.modules['soundfile'] = mock.Mock()
-import acts_contrib.test_utils.audio_analysis_lib.audio_analysis as audio_analysis
-import acts_contrib.test_utils.audio_analysis_lib.audio_data as audio_data
+import acts.test_utils.audio_analysis_lib.audio_analysis as audio_analysis
+import acts.test_utils.audio_analysis_lib.audio_data as audio_data
class SpectralAnalysisTest(unittest.TestCase):
@@ -133,7 +133,7 @@
def test_spectral_snalysis_real_data(self):
"""This unittest checks the spectral analysis works on real data."""
file_path = os.path.join(
- os.path.dirname(__file__), '../../../acts/framework/tests/test_data', '1k_2k.raw')
+ os.path.dirname(__file__), 'test_data', '1k_2k.raw')
binary = open(file_path, 'rb').read()
data = audio_data.AudioRawData(binary, 2, 'S32_LE')
saturate_value = audio_data.get_maximum_value_from_sample_format(
diff --git a/acts_tests/acts_contrib/test_utils_tests/audio_quality_measurement_integrationtest.py b/acts/framework/tests/audio_quality_measurement_integrationtest.py
similarity index 98%
rename from acts_tests/acts_contrib/test_utils_tests/audio_quality_measurement_integrationtest.py
rename to acts/framework/tests/audio_quality_measurement_integrationtest.py
index 396e5b8..e6e0c70 100644
--- a/acts_tests/acts_contrib/test_utils_tests/audio_quality_measurement_integrationtest.py
+++ b/acts/framework/tests/audio_quality_measurement_integrationtest.py
@@ -27,7 +27,7 @@
import mock
sys.modules['soundfile'] = mock.Mock()
-import acts_contrib.test_utils.audio_analysis_lib.audio_quality_measurement as audio_quality_measurement
+import acts.test_utils.audio_analysis_lib.audio_quality_measurement as audio_quality_measurement
class NoiseLevelTest(unittest.TestCase):
diff --git a/acts_tests/acts_contrib/test_utils/__init__.py b/acts/framework/tests/test_utils/__init__.py
similarity index 100%
copy from acts_tests/acts_contrib/test_utils/__init__.py
copy to acts/framework/tests/test_utils/__init__.py
diff --git a/acts_tests/acts_contrib/test_utils/instrumentation/__init__.py b/acts/framework/tests/test_utils/instrumentation/__init__.py
similarity index 100%
copy from acts_tests/acts_contrib/test_utils/instrumentation/__init__.py
copy to acts/framework/tests/test_utils/instrumentation/__init__.py
diff --git a/acts_tests/acts_contrib/test_utils_tests/instrumentation/config_wrapper_test.py b/acts/framework/tests/test_utils/instrumentation/config_wrapper_test.py
similarity index 96%
rename from acts_tests/acts_contrib/test_utils_tests/instrumentation/config_wrapper_test.py
rename to acts/framework/tests/test_utils/instrumentation/config_wrapper_test.py
index 3633f76..63313b0 100755
--- a/acts_tests/acts_contrib/test_utils_tests/instrumentation/config_wrapper_test.py
+++ b/acts/framework/tests/test_utils/instrumentation/config_wrapper_test.py
@@ -18,10 +18,10 @@
import unittest
from acts import context
-from acts_contrib.test_utils.instrumentation.config_wrapper import ConfigWrapper
-from acts_contrib.test_utils.instrumentation.config_wrapper import ContextualConfigWrapper
-from acts_contrib.test_utils.instrumentation.config_wrapper import InvalidParamError
-from acts_contrib.test_utils.instrumentation.config_wrapper import merge
+from acts.test_utils.instrumentation.config_wrapper import ConfigWrapper
+from acts.test_utils.instrumentation.config_wrapper import ContextualConfigWrapper
+from acts.test_utils.instrumentation.config_wrapper import InvalidParamError
+from acts.test_utils.instrumentation.config_wrapper import merge
REAL_PATHS = ['realpath/1', 'realpath/2']
MOCK_CONFIG = {
diff --git a/acts_tests/acts_contrib/test_utils_tests/instrumentation/data/instrumentation_proto_parser/sample.instrumentation_data_proto b/acts/framework/tests/test_utils/instrumentation/data/instrumentation_proto_parser/sample.instrumentation_data_proto
similarity index 100%
rename from acts_tests/acts_contrib/test_utils_tests/instrumentation/data/instrumentation_proto_parser/sample.instrumentation_data_proto
rename to acts/framework/tests/test_utils/instrumentation/data/instrumentation_proto_parser/sample.instrumentation_data_proto
diff --git a/acts_tests/acts_contrib/test_utils_tests/instrumentation/data/instrumentation_proto_parser/sample_instrumentation_proto.txt b/acts/framework/tests/test_utils/instrumentation/data/instrumentation_proto_parser/sample_instrumentation_proto.txt
similarity index 100%
rename from acts_tests/acts_contrib/test_utils_tests/instrumentation/data/instrumentation_proto_parser/sample_instrumentation_proto.txt
rename to acts/framework/tests/test_utils/instrumentation/data/instrumentation_proto_parser/sample_instrumentation_proto.txt
diff --git a/acts_tests/acts_contrib/test_utils_tests/instrumentation/data/instrumentation_proto_parser/sample_timestamp.instrumentation_data_proto b/acts/framework/tests/test_utils/instrumentation/data/instrumentation_proto_parser/sample_timestamp.instrumentation_data_proto
similarity index 100%
rename from acts_tests/acts_contrib/test_utils_tests/instrumentation/data/instrumentation_proto_parser/sample_timestamp.instrumentation_data_proto
rename to acts/framework/tests/test_utils/instrumentation/data/instrumentation_proto_parser/sample_timestamp.instrumentation_data_proto
Binary files differ
diff --git a/acts_tests/acts_contrib/test_utils_tests/instrumentation/data/instrumentation_proto_parser/sample_timestamp_proto.txt b/acts/framework/tests/test_utils/instrumentation/data/instrumentation_proto_parser/sample_timestamp_proto.txt
similarity index 100%
rename from acts_tests/acts_contrib/test_utils_tests/instrumentation/data/instrumentation_proto_parser/sample_timestamp_proto.txt
rename to acts/framework/tests/test_utils/instrumentation/data/instrumentation_proto_parser/sample_timestamp_proto.txt
diff --git a/acts_tests/acts_contrib/test_utils_tests/instrumentation/data/instrumentation_proto_parser/string_values.prototxt b/acts/framework/tests/test_utils/instrumentation/data/instrumentation_proto_parser/string_values.prototxt
similarity index 100%
rename from acts_tests/acts_contrib/test_utils_tests/instrumentation/data/instrumentation_proto_parser/string_values.prototxt
rename to acts/framework/tests/test_utils/instrumentation/data/instrumentation_proto_parser/string_values.prototxt
diff --git a/acts_tests/acts_contrib/test_utils_tests/instrumentation/data/instrumentation_text_output_parser/long_instrumentation_result.txt b/acts/framework/tests/test_utils/instrumentation/data/instrumentation_text_output_parser/long_instrumentation_result.txt
similarity index 100%
rename from acts_tests/acts_contrib/test_utils_tests/instrumentation/data/instrumentation_text_output_parser/long_instrumentation_result.txt
rename to acts/framework/tests/test_utils/instrumentation/data/instrumentation_text_output_parser/long_instrumentation_result.txt
diff --git a/acts_tests/acts_contrib/test_utils_tests/instrumentation/data/instrumentation_text_output_parser/long_statuses.txt b/acts/framework/tests/test_utils/instrumentation/data/instrumentation_text_output_parser/long_statuses.txt
similarity index 100%
rename from acts_tests/acts_contrib/test_utils_tests/instrumentation/data/instrumentation_text_output_parser/long_statuses.txt
rename to acts/framework/tests/test_utils/instrumentation/data/instrumentation_text_output_parser/long_statuses.txt
diff --git a/acts_tests/acts_contrib/test_utils_tests/instrumentation/data/instrumentation_text_output_parser/malformed.txt b/acts/framework/tests/test_utils/instrumentation/data/instrumentation_text_output_parser/malformed.txt
similarity index 100%
rename from acts_tests/acts_contrib/test_utils_tests/instrumentation/data/instrumentation_text_output_parser/malformed.txt
rename to acts/framework/tests/test_utils/instrumentation/data/instrumentation_text_output_parser/malformed.txt
diff --git a/acts_tests/acts_contrib/test_utils_tests/instrumentation/data/instrumentation_text_output_parser/session_result_code_is_20.txt b/acts/framework/tests/test_utils/instrumentation/data/instrumentation_text_output_parser/session_result_code_is_20.txt
similarity index 100%
rename from acts_tests/acts_contrib/test_utils_tests/instrumentation/data/instrumentation_text_output_parser/session_result_code_is_20.txt
rename to acts/framework/tests/test_utils/instrumentation/data/instrumentation_text_output_parser/session_result_code_is_20.txt
diff --git a/acts_tests/acts_contrib/test_utils_tests/instrumentation/data/instrumentation_text_output_parser/test_status_result_code_is_42.txt b/acts/framework/tests/test_utils/instrumentation/data/instrumentation_text_output_parser/test_status_result_code_is_42.txt
similarity index 100%
rename from acts_tests/acts_contrib/test_utils_tests/instrumentation/data/instrumentation_text_output_parser/test_status_result_code_is_42.txt
rename to acts/framework/tests/test_utils/instrumentation/data/instrumentation_text_output_parser/test_status_result_code_is_42.txt
diff --git a/acts_tests/acts_contrib/test_utils/instrumentation/device/__init__.py b/acts/framework/tests/test_utils/instrumentation/device/__init__.py
similarity index 100%
copy from acts_tests/acts_contrib/test_utils/instrumentation/device/__init__.py
copy to acts/framework/tests/test_utils/instrumentation/device/__init__.py
diff --git a/acts_tests/acts_contrib/test_utils/instrumentation/device/apps/__init__.py b/acts/framework/tests/test_utils/instrumentation/device/apps/__init__.py
similarity index 100%
copy from acts_tests/acts_contrib/test_utils/instrumentation/device/apps/__init__.py
copy to acts/framework/tests/test_utils/instrumentation/device/apps/__init__.py
diff --git a/acts_tests/acts_contrib/test_utils_tests/instrumentation/device/apps/dismiss_dialogs_test.py b/acts/framework/tests/test_utils/instrumentation/device/apps/dismiss_dialogs_test.py
similarity index 93%
rename from acts_tests/acts_contrib/test_utils_tests/instrumentation/device/apps/dismiss_dialogs_test.py
rename to acts/framework/tests/test_utils/instrumentation/device/apps/dismiss_dialogs_test.py
index 19ada84..98e79d1 100644
--- a/acts_tests/acts_contrib/test_utils_tests/instrumentation/device/apps/dismiss_dialogs_test.py
+++ b/acts/framework/tests/test_utils/instrumentation/device/apps/dismiss_dialogs_test.py
@@ -17,9 +17,9 @@
import unittest
import mock
-from acts_contrib.test_utils.instrumentation.device.apps.dismiss_dialogs import \
+from acts.test_utils.instrumentation.device.apps.dismiss_dialogs import \
DialogDismissalUtil
-from acts_contrib.test_utils.instrumentation.device.apps.dismiss_dialogs import \
+from acts.test_utils.instrumentation.device.apps.dismiss_dialogs import \
DISMISS_DIALOGS_TIMEOUT
diff --git a/acts_tests/acts_contrib/test_utils_tests/instrumentation/device/apps/hotword_model_extractor_test.py b/acts/framework/tests/test_utils/instrumentation/device/apps/hotword_model_extractor_test.py
similarity index 88%
rename from acts_tests/acts_contrib/test_utils_tests/instrumentation/device/apps/hotword_model_extractor_test.py
rename to acts/framework/tests/test_utils/instrumentation/device/apps/hotword_model_extractor_test.py
index e4115a3..053da31 100644
--- a/acts_tests/acts_contrib/test_utils_tests/instrumentation/device/apps/hotword_model_extractor_test.py
+++ b/acts/framework/tests/test_utils/instrumentation/device/apps/hotword_model_extractor_test.py
@@ -18,9 +18,9 @@
import unittest
import mock
-from acts_contrib.test_utils.instrumentation.device.apps.hotword_model_extractor import \
+from acts.test_utils.instrumentation.device.apps.hotword_model_extractor import \
HotwordModelExtractor
-from acts_contrib.test_utils.instrumentation.device.apps.hotword_model_extractor import \
+from acts.test_utils.instrumentation.device.apps.hotword_model_extractor import \
MODEL_DIR
GOOD_PACKAGE = 'good_package'
@@ -48,7 +48,7 @@
pass
-@mock.patch('acts_contrib.test_utils.instrumentation.device.apps.app_installer.'
+@mock.patch('acts.test_utils.instrumentation.device.apps.app_installer.'
'AppInstaller.pull_from_device', side_effect=mock_pull_from_device)
@mock.patch('zipfile.ZipFile', return_value=MockZipFile())
class HotwordModelExtractorTest(unittest.TestCase):
diff --git a/acts_tests/acts_contrib/test_utils_tests/instrumentation/device/apps/permissions_test.py b/acts/framework/tests/test_utils/instrumentation/device/apps/permissions_test.py
similarity index 94%
rename from acts_tests/acts_contrib/test_utils_tests/instrumentation/device/apps/permissions_test.py
rename to acts/framework/tests/test_utils/instrumentation/device/apps/permissions_test.py
index 836f53c..ffaff23 100644
--- a/acts_tests/acts_contrib/test_utils_tests/instrumentation/device/apps/permissions_test.py
+++ b/acts/framework/tests/test_utils/instrumentation/device/apps/permissions_test.py
@@ -17,7 +17,7 @@
import unittest
import mock
-from acts_contrib.test_utils.instrumentation.device.apps.permissions import \
+from acts.test_utils.instrumentation.device.apps.permissions import \
PermissionsUtil
diff --git a/acts_tests/acts_contrib/test_utils/instrumentation/device/command/__init__.py b/acts/framework/tests/test_utils/instrumentation/device/command/__init__.py
similarity index 100%
copy from acts_tests/acts_contrib/test_utils/instrumentation/device/command/__init__.py
copy to acts/framework/tests/test_utils/instrumentation/device/command/__init__.py
diff --git a/acts_tests/acts_contrib/test_utils_tests/instrumentation/device/command/adb_command_types_test.py b/acts/framework/tests/test_utils/instrumentation/device/command/adb_command_types_test.py
similarity index 92%
rename from acts_tests/acts_contrib/test_utils_tests/instrumentation/device/command/adb_command_types_test.py
rename to acts/framework/tests/test_utils/instrumentation/device/command/adb_command_types_test.py
index abb3f26..7898a7d 100755
--- a/acts_tests/acts_contrib/test_utils_tests/instrumentation/device/command/adb_command_types_test.py
+++ b/acts/framework/tests/test_utils/instrumentation/device/command/adb_command_types_test.py
@@ -16,15 +16,15 @@
import unittest
-from acts_contrib.test_utils.instrumentation.device.command.adb_command_types import \
+from acts.test_utils.instrumentation.device.command.adb_command_types import \
DeviceBinaryCommandSeries
-from acts_contrib.test_utils.instrumentation.device.command.adb_command_types import \
+from acts.test_utils.instrumentation.device.command.adb_command_types import \
DeviceGServices
-from acts_contrib.test_utils.instrumentation.device.command.adb_command_types import \
+from acts.test_utils.instrumentation.device.command.adb_command_types import \
DeviceSetprop
-from acts_contrib.test_utils.instrumentation.device.command.adb_command_types import \
+from acts.test_utils.instrumentation.device.command.adb_command_types import \
DeviceSetting
-from acts_contrib.test_utils.instrumentation.device.command.adb_command_types import \
+from acts.test_utils.instrumentation.device.command.adb_command_types import \
DeviceState
diff --git a/acts_tests/acts_contrib/test_utils_tests/instrumentation/device/command/instrumentation_command_builder_test.py b/acts/framework/tests/test_utils/instrumentation/device/command/instrumentation_command_builder_test.py
similarity index 93%
rename from acts_tests/acts_contrib/test_utils_tests/instrumentation/device/command/instrumentation_command_builder_test.py
rename to acts/framework/tests/test_utils/instrumentation/device/command/instrumentation_command_builder_test.py
index 584c8bf..f727f0c 100755
--- a/acts_tests/acts_contrib/test_utils_tests/instrumentation/device/command/instrumentation_command_builder_test.py
+++ b/acts/framework/tests/test_utils/instrumentation/device/command/instrumentation_command_builder_test.py
@@ -16,8 +16,8 @@
import unittest
-from acts_contrib.test_utils.instrumentation.device.command.instrumentation_command_builder import InstrumentationCommandBuilder
-from acts_contrib.test_utils.instrumentation.device.command.instrumentation_command_builder import InstrumentationTestCommandBuilder
+from acts.test_utils.instrumentation.device.command.instrumentation_command_builder import InstrumentationCommandBuilder
+from acts.test_utils.instrumentation.device.command.instrumentation_command_builder import InstrumentationTestCommandBuilder
class InstrumentationCommandBuilderTest(unittest.TestCase):
@@ -122,7 +122,7 @@
class InstrumentationTestCommandBuilderTest(unittest.TestCase):
"""Test class for
- acts_contrib/test_utils/instrumentation/instrumentation_call_builder.py
+ acts/test_utils/instrumentation/instrumentation_call_builder.py
"""
def test__test_packages_can_not_be_added_if_classes_were_added_first(self):
diff --git a/acts_tests/acts_contrib/test_utils_tests/instrumentation/device/command/intent_builder_test.py b/acts/framework/tests/test_utils/instrumentation/device/command/intent_builder_test.py
similarity index 97%
rename from acts_tests/acts_contrib/test_utils_tests/instrumentation/device/command/intent_builder_test.py
rename to acts/framework/tests/test_utils/instrumentation/device/command/intent_builder_test.py
index 838eeaa..e69b1a2 100644
--- a/acts_tests/acts_contrib/test_utils_tests/instrumentation/device/command/intent_builder_test.py
+++ b/acts/framework/tests/test_utils/instrumentation/device/command/intent_builder_test.py
@@ -16,7 +16,7 @@
import unittest
-from acts_contrib.test_utils.instrumentation.device.command.intent_builder import \
+from acts.test_utils.instrumentation.device.command.intent_builder import \
IntentBuilder
diff --git a/acts_tests/acts_contrib/test_utils_tests/instrumentation/instrumentation_base_test_test.py b/acts/framework/tests/test_utils/instrumentation/instrumentation_base_test_test.py
similarity index 93%
rename from acts_tests/acts_contrib/test_utils_tests/instrumentation/instrumentation_base_test_test.py
rename to acts/framework/tests/test_utils/instrumentation/instrumentation_base_test_test.py
index 6b4ab1d..2c3a060 100755
--- a/acts_tests/acts_contrib/test_utils_tests/instrumentation/instrumentation_base_test_test.py
+++ b/acts/framework/tests/test_utils/instrumentation/instrumentation_base_test_test.py
@@ -19,12 +19,12 @@
import unittest
from unittest.mock import MagicMock
-from acts_contrib.test_utils.instrumentation.config_wrapper import ConfigWrapper
+from acts.test_utils.instrumentation.config_wrapper import ConfigWrapper
-from acts_contrib.test_utils.instrumentation.device.command.adb_command_types import \
+from acts.test_utils.instrumentation.device.command.adb_command_types import \
GenericCommand
-from acts_contrib.test_utils.instrumentation.instrumentation_base_test import \
+from acts.test_utils.instrumentation.instrumentation_base_test import \
InstrumentationBaseTest
MOCK_TEST_OPTIONS = {
diff --git a/acts_tests/acts_contrib/test_utils_tests/instrumentation/instrumentation_proto_parser_test.py b/acts/framework/tests/test_utils/instrumentation/instrumentation_proto_parser_test.py
similarity index 94%
rename from acts_tests/acts_contrib/test_utils_tests/instrumentation/instrumentation_proto_parser_test.py
rename to acts/framework/tests/test_utils/instrumentation/instrumentation_proto_parser_test.py
index a741840..bfb235e 100644
--- a/acts_tests/acts_contrib/test_utils_tests/instrumentation/instrumentation_proto_parser_test.py
+++ b/acts/framework/tests/test_utils/instrumentation/instrumentation_proto_parser_test.py
@@ -18,9 +18,9 @@
import unittest
import mock
-from acts_contrib.test_utils.instrumentation import instrumentation_proto_parser as parser
-from acts_contrib.test_utils.instrumentation.instrumentation_proto_parser import ProtoParserError
-from acts_contrib.test_utils.instrumentation.proto.gen import instrumentation_data_pb2
+from acts.test_utils.instrumentation import instrumentation_proto_parser as parser
+from acts.test_utils.instrumentation.instrumentation_proto_parser import ProtoParserError
+from acts.test_utils.instrumentation.proto.gen import instrumentation_data_pb2
from google.protobuf import text_format
DEST_DIR = 'dest/proto_dir'
diff --git a/acts_tests/acts_contrib/test_utils_tests/instrumentation/instrumentation_text_output_parser_test.py b/acts/framework/tests/test_utils/instrumentation/instrumentation_text_output_parser_test.py
similarity index 98%
rename from acts_tests/acts_contrib/test_utils_tests/instrumentation/instrumentation_text_output_parser_test.py
rename to acts/framework/tests/test_utils/instrumentation/instrumentation_text_output_parser_test.py
index 3334ab9..161f30a 100644
--- a/acts_tests/acts_contrib/test_utils_tests/instrumentation/instrumentation_text_output_parser_test.py
+++ b/acts/framework/tests/test_utils/instrumentation/instrumentation_text_output_parser_test.py
@@ -17,7 +17,7 @@
import os
import unittest
-from acts_contrib.test_utils.instrumentation import instrumentation_text_output_parser
+from acts.test_utils.instrumentation import instrumentation_text_output_parser
SAMPLE_WITH_LONG_STATUSES = \
'data/instrumentation_text_output_parser/long_statuses.txt'
diff --git a/acts_tests/acts_contrib/test_utils/instrumentation/power/__init__.py b/acts/framework/tests/test_utils/instrumentation/power/__init__.py
similarity index 100%
copy from acts_tests/acts_contrib/test_utils/instrumentation/power/__init__.py
copy to acts/framework/tests/test_utils/instrumentation/power/__init__.py
diff --git a/acts_tests/acts_contrib/test_utils_tests/instrumentation/power/instrumentation_power_test_test.py b/acts/framework/tests/test_utils/instrumentation/power/instrumentation_power_test_test.py
similarity index 96%
rename from acts_tests/acts_contrib/test_utils_tests/instrumentation/power/instrumentation_power_test_test.py
rename to acts/framework/tests/test_utils/instrumentation/power/instrumentation_power_test_test.py
index 5ab8b24..c626124 100644
--- a/acts_tests/acts_contrib/test_utils_tests/instrumentation/power/instrumentation_power_test_test.py
+++ b/acts/framework/tests/test_utils/instrumentation/power/instrumentation_power_test_test.py
@@ -18,10 +18,10 @@
from acts import signals
from acts.controllers import power_metrics
-from acts_contrib.test_utils.instrumentation import instrumentation_proto_parser as parser
-from acts_contrib.test_utils.instrumentation.config_wrapper import ConfigWrapper
-from acts_contrib.test_utils.instrumentation.power.instrumentation_power_test import ACCEPTANCE_THRESHOLD
-from acts_contrib.test_utils.instrumentation.power.instrumentation_power_test import InstrumentationPowerTest
+from acts.test_utils.instrumentation import instrumentation_proto_parser as parser
+from acts.test_utils.instrumentation.config_wrapper import ConfigWrapper
+from acts.test_utils.instrumentation.power.instrumentation_power_test import ACCEPTANCE_THRESHOLD
+from acts.test_utils.instrumentation.power.instrumentation_power_test import InstrumentationPowerTest
import mock
# avg: 2.214, stdev: 1.358, max: 4.78, min: 0.61
diff --git a/acts_tests/acts_contrib/test_utils_tests/instrumentation/power/thresholds_test.py b/acts/framework/tests/test_utils/instrumentation/power/thresholds_test.py
similarity index 96%
rename from acts_tests/acts_contrib/test_utils_tests/instrumentation/power/thresholds_test.py
rename to acts/framework/tests/test_utils/instrumentation/power/thresholds_test.py
index d93add3..242337d 100644
--- a/acts_tests/acts_contrib/test_utils_tests/instrumentation/power/thresholds_test.py
+++ b/acts/framework/tests/test_utils/instrumentation/power/thresholds_test.py
@@ -17,8 +17,8 @@
import unittest
from acts.controllers.power_metrics import Metric
-from acts_contrib.test_utils.instrumentation import config_wrapper
-from acts_contrib.test_utils.instrumentation.power.thresholds import AbsoluteThresholds
+from acts.test_utils.instrumentation import config_wrapper
+from acts.test_utils.instrumentation.power.thresholds import AbsoluteThresholds
class AbsoluteThresholdsTest(unittest.TestCase):
diff --git a/acts_tests/acts_contrib/test_utils_tests/instrumentation/unit_test_suite.py b/acts/framework/tests/test_utils/instrumentation/unit_test_suite.py
similarity index 100%
rename from acts_tests/acts_contrib/test_utils_tests/instrumentation/unit_test_suite.py
rename to acts/framework/tests/test_utils/instrumentation/unit_test_suite.py
diff --git a/acts_tests/acts_contrib/test_utils/power/__init__.py b/acts/framework/tests/test_utils/power/__init__.py
similarity index 100%
copy from acts_tests/acts_contrib/test_utils/power/__init__.py
copy to acts/framework/tests/test_utils/power/__init__.py
diff --git a/acts_tests/acts_contrib/test_utils_tests/power/tel/__init__.py b/acts/framework/tests/test_utils/power/tel/__init__.py
similarity index 100%
rename from acts_tests/acts_contrib/test_utils_tests/power/tel/__init__.py
rename to acts/framework/tests/test_utils/power/tel/__init__.py
diff --git a/acts_tests/acts_contrib/test_utils/__init__.py b/acts/framework/tests/test_utils/power/tel/lab/__init__.py
similarity index 100%
copy from acts_tests/acts_contrib/test_utils/__init__.py
copy to acts/framework/tests/test_utils/power/tel/lab/__init__.py
diff --git a/acts_tests/acts_contrib/test_utils_tests/power/tel/lab/consume_parameter_test.py b/acts/framework/tests/test_utils/power/tel/lab/consume_parameter_test.py
similarity index 96%
rename from acts_tests/acts_contrib/test_utils_tests/power/tel/lab/consume_parameter_test.py
rename to acts/framework/tests/test_utils/power/tel/lab/consume_parameter_test.py
index f1b899e..5a2a772 100644
--- a/acts_tests/acts_contrib/test_utils_tests/power/tel/lab/consume_parameter_test.py
+++ b/acts/framework/tests/test_utils/power/tel/lab/consume_parameter_test.py
@@ -26,7 +26,7 @@
"""
@classmethod
def setUpClass(self):
- from acts_contrib.test_utils.power.cellular.cellular_power_base_test import PowerCellularLabBaseTest as PCBT
+ from acts.test_utils.power.cellular.cellular_power_base_test import PowerCellularLabBaseTest as PCBT
self.PCBT = PCBT
PCBT.log = mock.Mock()
PCBT.log_path = ''
diff --git a/acts_tests/acts_contrib/test_utils_tests/power/tel/lab/ensure_valid_calibration_table_test.py b/acts/framework/tests/test_utils/power/tel/lab/ensure_valid_calibration_table_test.py
similarity index 96%
rename from acts_tests/acts_contrib/test_utils_tests/power/tel/lab/ensure_valid_calibration_table_test.py
rename to acts/framework/tests/test_utils/power/tel/lab/ensure_valid_calibration_table_test.py
index b15e892..058a7b5 100644
--- a/acts_tests/acts_contrib/test_utils_tests/power/tel/lab/ensure_valid_calibration_table_test.py
+++ b/acts/framework/tests/test_utils/power/tel/lab/ensure_valid_calibration_table_test.py
@@ -31,7 +31,7 @@
@classmethod
def setUpClass(self):
- from acts_contrib.test_utils.power.cellular.cellular_power_base_test import PowerCellularLabBaseTest as PCBT
+ from acts.test_utils.power.cellular.cellular_power_base_test import PowerCellularLabBaseTest as PCBT
self.PCBT = PCBT
PCBT.log = mock.Mock()
PCBT.log_path = ''
diff --git a/acts_tests/acts_contrib/test_utils_tests/power/tel/lab/init_simulation_test.py b/acts/framework/tests/test_utils/power/tel/lab/init_simulation_test.py
similarity index 96%
rename from acts_tests/acts_contrib/test_utils_tests/power/tel/lab/init_simulation_test.py
rename to acts/framework/tests/test_utils/power/tel/lab/init_simulation_test.py
index ef89239..24fe91a 100644
--- a/acts_tests/acts_contrib/test_utils_tests/power/tel/lab/init_simulation_test.py
+++ b/acts/framework/tests/test_utils/power/tel/lab/init_simulation_test.py
@@ -28,7 +28,7 @@
"""
@classmethod
def setUpClass(self):
- from acts_contrib.test_utils.power.cellular.cellular_power_base_test import PowerCellularLabBaseTest as PCBT
+ from acts.test_utils.power.cellular.cellular_power_base_test import PowerCellularLabBaseTest as PCBT
self.PCBT = PCBT
PCBT.log = mock.Mock()
PCBT.log_path = ''
diff --git a/acts_tests/acts_contrib/test_utils_tests/power/tel/lab/initialize_simulator_test.py b/acts/framework/tests/test_utils/power/tel/lab/initialize_simulator_test.py
similarity index 97%
rename from acts_tests/acts_contrib/test_utils_tests/power/tel/lab/initialize_simulator_test.py
rename to acts/framework/tests/test_utils/power/tel/lab/initialize_simulator_test.py
index e495a2a..5bf6dff 100644
--- a/acts_tests/acts_contrib/test_utils_tests/power/tel/lab/initialize_simulator_test.py
+++ b/acts/framework/tests/test_utils/power/tel/lab/initialize_simulator_test.py
@@ -28,7 +28,7 @@
"""
@classmethod
def setUpClass(self):
- from acts_contrib.test_utils.power.cellular.cellular_power_base_test import PowerCellularLabBaseTest as PCBT
+ from acts.test_utils.power.cellular.cellular_power_base_test import PowerCellularLabBaseTest as PCBT
self.PCBT = PCBT
PCBT.log = mock.Mock()
PCBT.log_path = ''
diff --git a/acts_tests/acts_contrib/test_utils_tests/power/tel/lab/mock_bokeh.py b/acts/framework/tests/test_utils/power/tel/lab/mock_bokeh.py
similarity index 100%
rename from acts_tests/acts_contrib/test_utils_tests/power/tel/lab/mock_bokeh.py
rename to acts/framework/tests/test_utils/power/tel/lab/mock_bokeh.py
diff --git a/acts_tests/acts_contrib/test_utils_tests/power/tel/lab/power_tel_traffic_e2e_test.py b/acts/framework/tests/test_utils/power/tel/lab/power_tel_traffic_e2e_test.py
similarity index 91%
rename from acts_tests/acts_contrib/test_utils_tests/power/tel/lab/power_tel_traffic_e2e_test.py
rename to acts/framework/tests/test_utils/power/tel/lab/power_tel_traffic_e2e_test.py
index d0c9c0a..065543f 100644
--- a/acts_tests/acts_contrib/test_utils_tests/power/tel/lab/power_tel_traffic_e2e_test.py
+++ b/acts/framework/tests/test_utils/power/tel/lab/power_tel_traffic_e2e_test.py
@@ -16,7 +16,7 @@
import unittest
import mock_bokeh
-import acts_contrib.test_utils.power.cellular.cellular_traffic_power_test as ctpt
+import acts.test_utils.power.cellular.cellular_traffic_power_test as ctpt
import mobly.config_parser as mobly_config_parser
from acts.controllers.cellular_lib.LteSimulation import LteSimulation
from acts.controllers.rohdeschwarz_lib import cmw500_cellular_simulator as cmw
@@ -39,12 +39,12 @@
@magic_patch('os.system')
@magic_patch('time.sleep')
@magic_patch(
- 'acts_contrib.test_utils.power.cellular.cellular_power_base_test.telutils')
- @magic_patch('acts_contrib.test_utils.power.PowerBaseTest.wutils')
+ 'acts.test_utils.power.cellular.cellular_power_base_test.telutils')
+ @magic_patch('acts.test_utils.power.PowerBaseTest.wutils')
@magic_patch(
'acts.metrics.loggers.blackbox.BlackboxMetricLogger.for_test_case')
@magic_patch(
- 'acts_contrib.test_utils.power.loggers.power_metric_logger.PowerMetricLogger.for_test_case'
+ 'acts.test_utils.power.loggers.power_metric_logger.PowerMetricLogger.for_test_case'
)
def test_e2e(self, *args):
diff --git a/acts_tests/acts_contrib/test_utils_tests/power/tel/lab/save_summary_to_file_test.py b/acts/framework/tests/test_utils/power/tel/lab/save_summary_to_file_test.py
similarity index 94%
rename from acts_tests/acts_contrib/test_utils_tests/power/tel/lab/save_summary_to_file_test.py
rename to acts/framework/tests/test_utils/power/tel/lab/save_summary_to_file_test.py
index e9563af..900c3a7 100644
--- a/acts_tests/acts_contrib/test_utils_tests/power/tel/lab/save_summary_to_file_test.py
+++ b/acts/framework/tests/test_utils/power/tel/lab/save_summary_to_file_test.py
@@ -29,7 +29,7 @@
@classmethod
def setUpClass(self):
- from acts_contrib.test_utils.power.cellular.cellular_power_base_test import PowerCellularLabBaseTest as PCBT
+ from acts.test_utils.power.cellular.cellular_power_base_test import PowerCellularLabBaseTest as PCBT
self.PCBT = PCBT
PCBT.log = mock.Mock()
PCBT.log_path = ''
diff --git a/acts_tests/acts_contrib/test_utils b/acts_tests/acts_contrib/test_utils
new file mode 120000
index 0000000..8a6ce16
--- /dev/null
+++ b/acts_tests/acts_contrib/test_utils
@@ -0,0 +1 @@
+../../acts/framework/acts/test_utils
\ No newline at end of file
diff --git a/acts_tests/acts_contrib/test_utils_tests b/acts_tests/acts_contrib/test_utils_tests
new file mode 120000
index 0000000..0615a35
--- /dev/null
+++ b/acts_tests/acts_contrib/test_utils_tests
@@ -0,0 +1 @@
+../../acts/framework/tests/test_utils
\ No newline at end of file
diff --git a/acts_tests/acts_contrib/test_utils_tests/__init__.py b/acts_tests/acts_contrib/test_utils_tests/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/acts_tests/acts_contrib/test_utils_tests/__init__.py
+++ /dev/null
diff --git a/acts_tests/acts_contrib/test_utils_tests/acts_import_test_utils_test.py b/acts_tests/acts_contrib/test_utils_tests/acts_import_test_utils_test.py
deleted file mode 100755
index 1fcb699..0000000
--- a/acts_tests/acts_contrib/test_utils_tests/acts_import_test_utils_test.py
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/usr/bin/env python3
-#
-# Copyright 2016 - The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import unittest
-
-
-class ActsImportTestUtilsTest(unittest.TestCase):
- """This test class has unit tests for the implementation of everything
- under acts_contrib.test_utils.*
- """
-
- def test_import_successful(self):
- """ Test to return true if all imports were successful.
-
- This test will fail if any import was unsuccessful.
- """
- try:
- from acts import utils
-
- from acts_contrib.test_utils.bt import BleEnum
- from acts_contrib.test_utils.bt import BluetoothBaseTest
- from acts_contrib.test_utils.bt import BluetoothCarHfpBaseTest
- from acts_contrib.test_utils.bt import BtEnum
- from acts_contrib.test_utils.bt import GattConnectedBaseTest
- from acts_contrib.test_utils.bt import GattEnum
- from acts_contrib.test_utils.bt import bt_contacts_utils
- from acts_contrib.test_utils.bt import bt_gatt_utils
- from acts_contrib.test_utils.bt import bt_test_utils
- from acts_contrib.test_utils.bt import native_bt_test_utils
-
- from acts_contrib.test_utils.car import car_bt_utils
- from acts_contrib.test_utils.car import car_media_utils
- from acts_contrib.test_utils.car import car_telecom_utils
- from acts_contrib.test_utils.car import tel_telecom_utils
-
- from acts_contrib.test_utils.net import connectivity_const
- from acts_contrib.test_utils.net import connectivity_const
-
- from acts_contrib.test_utils.tel import TelephonyBaseTest
- from acts_contrib.test_utils.tel import tel_atten_utils
- from acts_contrib.test_utils.tel import tel_data_utils
- from acts_contrib.test_utils.tel import tel_defines
- from acts_contrib.test_utils.tel import tel_lookup_tables
- from acts_contrib.test_utils.tel import tel_subscription_utils
- from acts_contrib.test_utils.tel import tel_test_utils
- from acts_contrib.test_utils.tel import tel_video_utils
- from acts_contrib.test_utils.tel import tel_voice_utils
-
- from acts_contrib.test_utils.wifi import wifi_constants
- from acts_contrib.test_utils.wifi import wifi_test_utils
-
- except Exception:
- self.fail('Unable to import all supported test_utils')
-
-
-if __name__ == '__main__':
- unittest.main()
diff --git a/acts_tests/acts_contrib/test_utils_tests/instrumentation/__init__.py b/acts_tests/acts_contrib/test_utils_tests/instrumentation/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/acts_tests/acts_contrib/test_utils_tests/instrumentation/__init__.py
+++ /dev/null
diff --git a/acts_tests/acts_contrib/test_utils_tests/instrumentation/device/__init__.py b/acts_tests/acts_contrib/test_utils_tests/instrumentation/device/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/acts_tests/acts_contrib/test_utils_tests/instrumentation/device/__init__.py
+++ /dev/null
diff --git a/acts_tests/acts_contrib/test_utils_tests/instrumentation/device/apps/__init__.py b/acts_tests/acts_contrib/test_utils_tests/instrumentation/device/apps/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/acts_tests/acts_contrib/test_utils_tests/instrumentation/device/apps/__init__.py
+++ /dev/null
diff --git a/acts_tests/acts_contrib/test_utils_tests/instrumentation/device/command/__init__.py b/acts_tests/acts_contrib/test_utils_tests/instrumentation/device/command/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/acts_tests/acts_contrib/test_utils_tests/instrumentation/device/command/__init__.py
+++ /dev/null
diff --git a/acts_tests/acts_contrib/test_utils_tests/instrumentation/power/__init__.py b/acts_tests/acts_contrib/test_utils_tests/instrumentation/power/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/acts_tests/acts_contrib/test_utils_tests/instrumentation/power/__init__.py
+++ /dev/null
diff --git a/acts_tests/acts_contrib/test_utils_tests/power/__init__.py b/acts_tests/acts_contrib/test_utils_tests/power/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/acts_tests/acts_contrib/test_utils_tests/power/__init__.py
+++ /dev/null
diff --git a/acts_tests/tests/google/ble/api/BleAdvertiseApiTest.py b/acts_tests/tests/google/ble/api/BleAdvertiseApiTest.py
index c044b4d..26c459f 100644
--- a/acts_tests/tests/google/ble/api/BleAdvertiseApiTest.py
+++ b/acts_tests/tests/google/ble/api/BleAdvertiseApiTest.py
@@ -22,12 +22,12 @@
from acts.controllers.sl4a_lib import rpc_client
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
-from acts_contrib.test_utils.bt.bt_test_utils import adv_fail
-from acts_contrib.test_utils.bt.bt_test_utils import generate_ble_advertise_objects
-from acts_contrib.test_utils.bt.bt_constants import ble_advertise_settings_modes
-from acts_contrib.test_utils.bt.bt_constants import ble_advertise_settings_tx_powers
-from acts_contrib.test_utils.bt.bt_constants import java_integer
+from acts.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
+from acts.test_utils.bt.bt_test_utils import adv_fail
+from acts.test_utils.bt.bt_test_utils import generate_ble_advertise_objects
+from acts.test_utils.bt.bt_constants import ble_advertise_settings_modes
+from acts.test_utils.bt.bt_constants import ble_advertise_settings_tx_powers
+from acts.test_utils.bt.bt_constants import java_integer
class BleAdvertiseVerificationError(Exception):
diff --git a/acts_tests/tests/google/ble/api/BleScanApiTest.py b/acts_tests/tests/google/ble/api/BleScanApiTest.py
index 7e824f4..06f2362 100644
--- a/acts_tests/tests/google/ble/api/BleScanApiTest.py
+++ b/acts_tests/tests/google/ble/api/BleScanApiTest.py
@@ -22,12 +22,12 @@
from acts.controllers.sl4a_lib import rpc_client
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
-from acts_contrib.test_utils.bt.bt_constants import ble_scan_settings_callback_types
-from acts_contrib.test_utils.bt.bt_constants import ble_scan_settings_modes
-from acts_contrib.test_utils.bt.bt_constants import ble_scan_settings_result_types
-from acts_contrib.test_utils.bt.bt_constants import ble_scan_settings_report_delay_milli_seconds
-from acts_contrib.test_utils.bt.bt_constants import ble_uuids
+from acts.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
+from acts.test_utils.bt.bt_constants import ble_scan_settings_callback_types
+from acts.test_utils.bt.bt_constants import ble_scan_settings_modes
+from acts.test_utils.bt.bt_constants import ble_scan_settings_result_types
+from acts.test_utils.bt.bt_constants import ble_scan_settings_report_delay_milli_seconds
+from acts.test_utils.bt.bt_constants import ble_uuids
class BleScanResultsError(Exception):
diff --git a/acts_tests/tests/google/ble/api/GattApiTest.py b/acts_tests/tests/google/ble/api/GattApiTest.py
index f13809f..cc87979 100644
--- a/acts_tests/tests/google/ble/api/GattApiTest.py
+++ b/acts_tests/tests/google/ble/api/GattApiTest.py
@@ -19,8 +19,8 @@
from acts.controllers.sl4a_lib import rpc_client
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
-from acts_contrib.test_utils.bt.bt_test_utils import setup_multiple_devices_for_bt_test
+from acts.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
+from acts.test_utils.bt.bt_test_utils import setup_multiple_devices_for_bt_test
class GattApiTest(BluetoothBaseTest):
diff --git a/acts_tests/tests/google/ble/beacon_tests/BeaconSwarmTest.py b/acts_tests/tests/google/ble/beacon_tests/BeaconSwarmTest.py
index a084794..0df9a7b 100644
--- a/acts_tests/tests/google/ble/beacon_tests/BeaconSwarmTest.py
+++ b/acts_tests/tests/google/ble/beacon_tests/BeaconSwarmTest.py
@@ -22,17 +22,17 @@
import threading
-from acts_contrib.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
-from acts_contrib.test_utils.bt.BleEnum import AdvertiseSettingsAdvertiseMode
-from acts_contrib.test_utils.bt.BleEnum import ScanSettingsScanMode
-from acts_contrib.test_utils.bt.bt_test_utils import adv_succ
-from acts_contrib.test_utils.bt.bt_test_utils import batch_scan_result
-from acts_contrib.test_utils.bt.bt_test_utils import scan_result
-from acts_contrib.test_utils.bt.bt_test_utils import generate_ble_advertise_objects
-from acts_contrib.test_utils.bt.bt_test_utils import generate_ble_scan_objects
-from acts_contrib.test_utils.bt.bt_test_utils import reset_bluetooth
-from acts_contrib.test_utils.bt.bt_test_utils import setup_multiple_devices_for_bt_test
-from acts_contrib.test_utils.bt.bt_test_utils import take_btsnoop_logs
+from acts.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
+from acts.test_utils.bt.BleEnum import AdvertiseSettingsAdvertiseMode
+from acts.test_utils.bt.BleEnum import ScanSettingsScanMode
+from acts.test_utils.bt.bt_test_utils import adv_succ
+from acts.test_utils.bt.bt_test_utils import batch_scan_result
+from acts.test_utils.bt.bt_test_utils import scan_result
+from acts.test_utils.bt.bt_test_utils import generate_ble_advertise_objects
+from acts.test_utils.bt.bt_test_utils import generate_ble_scan_objects
+from acts.test_utils.bt.bt_test_utils import reset_bluetooth
+from acts.test_utils.bt.bt_test_utils import setup_multiple_devices_for_bt_test
+from acts.test_utils.bt.bt_test_utils import take_btsnoop_logs
class BeaconSwarmTest(BluetoothBaseTest):
diff --git a/acts_tests/tests/google/ble/bt5/AdvertisingSetTest.py b/acts_tests/tests/google/ble/bt5/AdvertisingSetTest.py
index 0245b8d..de4192f 100644
--- a/acts_tests/tests/google/ble/bt5/AdvertisingSetTest.py
+++ b/acts_tests/tests/google/ble/bt5/AdvertisingSetTest.py
@@ -26,18 +26,18 @@
from acts.asserts import assert_equal
from acts.asserts import assert_true
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
-from acts_contrib.test_utils.bt.bt_constants import ble_scan_settings_modes
-from acts_contrib.test_utils.bt.bt_constants import advertising_set_started
-from acts_contrib.test_utils.bt.bt_constants import advertising_set_stopped
-from acts_contrib.test_utils.bt.bt_constants import advertising_set_enabled
-from acts_contrib.test_utils.bt.bt_constants import advertising_set_data_set
-from acts_contrib.test_utils.bt.bt_constants import advertising_set_scan_response_set
-from acts_contrib.test_utils.bt.bt_constants import advertising_set_parameters_update
-from acts_contrib.test_utils.bt.bt_constants import advertising_set_periodic_parameters_updated
-from acts_contrib.test_utils.bt.bt_constants import advertising_set_periodic_data_set
-from acts_contrib.test_utils.bt.bt_constants import advertising_set_periodic_enable
-from acts_contrib.test_utils.bt.bt_test_utils import reset_bluetooth
+from acts.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
+from acts.test_utils.bt.bt_constants import ble_scan_settings_modes
+from acts.test_utils.bt.bt_constants import advertising_set_started
+from acts.test_utils.bt.bt_constants import advertising_set_stopped
+from acts.test_utils.bt.bt_constants import advertising_set_enabled
+from acts.test_utils.bt.bt_constants import advertising_set_data_set
+from acts.test_utils.bt.bt_constants import advertising_set_scan_response_set
+from acts.test_utils.bt.bt_constants import advertising_set_parameters_update
+from acts.test_utils.bt.bt_constants import advertising_set_periodic_parameters_updated
+from acts.test_utils.bt.bt_constants import advertising_set_periodic_data_set
+from acts.test_utils.bt.bt_constants import advertising_set_periodic_enable
+from acts.test_utils.bt.bt_test_utils import reset_bluetooth
from acts import signals
diff --git a/acts_tests/tests/google/ble/bt5/Bt5ScanTest.py b/acts_tests/tests/google/ble/bt5/Bt5ScanTest.py
index 496bbf9..e2c9c83 100644
--- a/acts_tests/tests/google/ble/bt5/Bt5ScanTest.py
+++ b/acts_tests/tests/google/ble/bt5/Bt5ScanTest.py
@@ -25,17 +25,17 @@
from acts import asserts
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
-from acts_contrib.test_utils.bt.bt_constants import ble_scan_settings_phys
-from acts_contrib.test_utils.bt.bt_constants import ble_scan_settings_modes
-from acts_contrib.test_utils.bt.bt_constants import batch_scan_result
-from acts_contrib.test_utils.bt.bt_test_utils import cleanup_scanners_and_advertisers
-from acts_contrib.test_utils.bt.bt_test_utils import generate_ble_advertise_objects
-from acts_contrib.test_utils.bt.bt_test_utils import generate_ble_scan_objects
-from acts_contrib.test_utils.bt.bt_test_utils import reset_bluetooth
-from acts_contrib.test_utils.bt.bt_constants import scan_result
-from acts_contrib.test_utils.bt.bt_constants import advertising_set_on_own_address_read
-from acts_contrib.test_utils.bt.bt_constants import advertising_set_started
+from acts.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
+from acts.test_utils.bt.bt_constants import ble_scan_settings_phys
+from acts.test_utils.bt.bt_constants import ble_scan_settings_modes
+from acts.test_utils.bt.bt_constants import batch_scan_result
+from acts.test_utils.bt.bt_test_utils import cleanup_scanners_and_advertisers
+from acts.test_utils.bt.bt_test_utils import generate_ble_advertise_objects
+from acts.test_utils.bt.bt_test_utils import generate_ble_scan_objects
+from acts.test_utils.bt.bt_test_utils import reset_bluetooth
+from acts.test_utils.bt.bt_constants import scan_result
+from acts.test_utils.bt.bt_constants import advertising_set_on_own_address_read
+from acts.test_utils.bt.bt_constants import advertising_set_started
from acts import signals
diff --git a/acts_tests/tests/google/ble/bt5/PhyTest.py b/acts_tests/tests/google/ble/bt5/PhyTest.py
index 69487b2..0b1ecfa 100644
--- a/acts_tests/tests/google/ble/bt5/PhyTest.py
+++ b/acts_tests/tests/google/ble/bt5/PhyTest.py
@@ -20,11 +20,11 @@
from queue import Empty
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
-from acts_contrib.test_utils.bt.GattConnectedBaseTest import GattConnectedBaseTest
-from acts_contrib.test_utils.bt.bt_constants import gatt_connection_priority
-from acts_contrib.test_utils.bt.bt_constants import gatt_event
-from acts_contrib.test_utils.bt.bt_constants import gatt_phy
+from acts.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
+from acts.test_utils.bt.GattConnectedBaseTest import GattConnectedBaseTest
+from acts.test_utils.bt.bt_constants import gatt_connection_priority
+from acts.test_utils.bt.bt_constants import gatt_event
+from acts.test_utils.bt.bt_constants import gatt_phy
from acts import signals
CONNECTION_PRIORITY_HIGH = gatt_connection_priority['high']
diff --git a/acts_tests/tests/google/ble/concurrency/ConcurrentBleAdvertisementDiscoveryTest.py b/acts_tests/tests/google/ble/concurrency/ConcurrentBleAdvertisementDiscoveryTest.py
index 2e2be83..c38fc93 100644
--- a/acts_tests/tests/google/ble/concurrency/ConcurrentBleAdvertisementDiscoveryTest.py
+++ b/acts_tests/tests/google/ble/concurrency/ConcurrentBleAdvertisementDiscoveryTest.py
@@ -24,21 +24,21 @@
from queue import Empty
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
-from acts_contrib.test_utils.bt.bt_constants import ble_advertise_settings_modes
-from acts_contrib.test_utils.bt.bt_constants import ble_scan_settings_callback_types
-from acts_contrib.test_utils.bt.bt_constants import ble_scan_settings_modes
-from acts_contrib.test_utils.bt.bt_constants import adv_succ
-from acts_contrib.test_utils.bt.bt_constants import scan_result
-from acts_contrib.test_utils.bt.bt_test_utils import BtTestUtilsError
-from acts_contrib.test_utils.bt.bt_test_utils import generate_ble_advertise_objects
-from acts_contrib.test_utils.bt.bt_test_utils import generate_ble_scan_objects
-from acts_contrib.test_utils.bt.bt_test_utils import get_advanced_droid_list
-from acts_contrib.test_utils.bt.bt_test_utils import reset_bluetooth
-from acts_contrib.test_utils.bt.bt_test_utils import setup_n_advertisements
-from acts_contrib.test_utils.bt.bt_test_utils import take_btsnoop_logs
-from acts_contrib.test_utils.bt.bt_test_utils import teardown_n_advertisements
-from acts_contrib.test_utils.bt.bt_test_utils import scan_and_verify_n_advertisements
+from acts.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
+from acts.test_utils.bt.bt_constants import ble_advertise_settings_modes
+from acts.test_utils.bt.bt_constants import ble_scan_settings_callback_types
+from acts.test_utils.bt.bt_constants import ble_scan_settings_modes
+from acts.test_utils.bt.bt_constants import adv_succ
+from acts.test_utils.bt.bt_constants import scan_result
+from acts.test_utils.bt.bt_test_utils import BtTestUtilsError
+from acts.test_utils.bt.bt_test_utils import generate_ble_advertise_objects
+from acts.test_utils.bt.bt_test_utils import generate_ble_scan_objects
+from acts.test_utils.bt.bt_test_utils import get_advanced_droid_list
+from acts.test_utils.bt.bt_test_utils import reset_bluetooth
+from acts.test_utils.bt.bt_test_utils import setup_n_advertisements
+from acts.test_utils.bt.bt_test_utils import take_btsnoop_logs
+from acts.test_utils.bt.bt_test_utils import teardown_n_advertisements
+from acts.test_utils.bt.bt_test_utils import scan_and_verify_n_advertisements
class ConcurrentBleAdvertisementDiscoveryTest(BluetoothBaseTest):
diff --git a/acts_tests/tests/google/ble/concurrency/ConcurrentBleAdvertisingTest.py b/acts_tests/tests/google/ble/concurrency/ConcurrentBleAdvertisingTest.py
index 7fd0d52..09c6cd3 100644
--- a/acts_tests/tests/google/ble/concurrency/ConcurrentBleAdvertisingTest.py
+++ b/acts_tests/tests/google/ble/concurrency/ConcurrentBleAdvertisingTest.py
@@ -24,21 +24,21 @@
from queue import Empty
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
-from acts_contrib.test_utils.bt.bt_test_utils import BtTestUtilsError
-from acts_contrib.test_utils.bt.bt_constants import ble_advertise_settings_modes
-from acts_contrib.test_utils.bt.bt_constants import ble_scan_settings_callback_types
-from acts_contrib.test_utils.bt.bt_constants import ble_scan_settings_modes
-from acts_contrib.test_utils.bt.bt_constants import adv_succ
-from acts_contrib.test_utils.bt.bt_test_utils import generate_ble_advertise_objects
-from acts_contrib.test_utils.bt.bt_test_utils import generate_ble_scan_objects
-from acts_contrib.test_utils.bt.bt_test_utils import get_advanced_droid_list
-from acts_contrib.test_utils.bt.bt_test_utils import reset_bluetooth
-from acts_contrib.test_utils.bt.bt_test_utils import scan_and_verify_n_advertisements
-from acts_contrib.test_utils.bt.bt_constants import scan_result
-from acts_contrib.test_utils.bt.bt_test_utils import setup_n_advertisements
-from acts_contrib.test_utils.bt.bt_test_utils import take_btsnoop_logs
-from acts_contrib.test_utils.bt.bt_test_utils import teardown_n_advertisements
+from acts.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
+from acts.test_utils.bt.bt_test_utils import BtTestUtilsError
+from acts.test_utils.bt.bt_constants import ble_advertise_settings_modes
+from acts.test_utils.bt.bt_constants import ble_scan_settings_callback_types
+from acts.test_utils.bt.bt_constants import ble_scan_settings_modes
+from acts.test_utils.bt.bt_constants import adv_succ
+from acts.test_utils.bt.bt_test_utils import generate_ble_advertise_objects
+from acts.test_utils.bt.bt_test_utils import generate_ble_scan_objects
+from acts.test_utils.bt.bt_test_utils import get_advanced_droid_list
+from acts.test_utils.bt.bt_test_utils import reset_bluetooth
+from acts.test_utils.bt.bt_test_utils import scan_and_verify_n_advertisements
+from acts.test_utils.bt.bt_constants import scan_result
+from acts.test_utils.bt.bt_test_utils import setup_n_advertisements
+from acts.test_utils.bt.bt_test_utils import take_btsnoop_logs
+from acts.test_utils.bt.bt_test_utils import teardown_n_advertisements
class ConcurrentBleAdvertisingTest(BluetoothBaseTest):
diff --git a/acts_tests/tests/google/ble/concurrency/ConcurrentBleScanningTest.py b/acts_tests/tests/google/ble/concurrency/ConcurrentBleScanningTest.py
index 3905bdb..512aed8 100644
--- a/acts_tests/tests/google/ble/concurrency/ConcurrentBleScanningTest.py
+++ b/acts_tests/tests/google/ble/concurrency/ConcurrentBleScanningTest.py
@@ -23,16 +23,16 @@
from queue import Empty
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
-from acts_contrib.test_utils.bt.bt_constants import ble_advertise_settings_modes
-from acts_contrib.test_utils.bt.bt_constants import ble_scan_settings_callback_types
-from acts_contrib.test_utils.bt.bt_constants import ble_scan_settings_modes
-from acts_contrib.test_utils.bt.bt_constants import adv_succ
-from acts_contrib.test_utils.bt.bt_test_utils import generate_ble_advertise_objects
-from acts_contrib.test_utils.bt.bt_test_utils import reset_bluetooth
-from acts_contrib.test_utils.bt.bt_constants import scan_failed
-from acts_contrib.test_utils.bt.bt_constants import scan_result
-from acts_contrib.test_utils.bt.bt_test_utils import take_btsnoop_logs
+from acts.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
+from acts.test_utils.bt.bt_constants import ble_advertise_settings_modes
+from acts.test_utils.bt.bt_constants import ble_scan_settings_callback_types
+from acts.test_utils.bt.bt_constants import ble_scan_settings_modes
+from acts.test_utils.bt.bt_constants import adv_succ
+from acts.test_utils.bt.bt_test_utils import generate_ble_advertise_objects
+from acts.test_utils.bt.bt_test_utils import reset_bluetooth
+from acts.test_utils.bt.bt_constants import scan_failed
+from acts.test_utils.bt.bt_constants import scan_result
+from acts.test_utils.bt.bt_test_utils import take_btsnoop_logs
class ConcurrentBleScanningTest(BluetoothBaseTest):
diff --git a/acts_tests/tests/google/ble/concurrency/ConcurrentGattConnectTest.py b/acts_tests/tests/google/ble/concurrency/ConcurrentGattConnectTest.py
index 6a5b861..ec5e09c 100644
--- a/acts_tests/tests/google/ble/concurrency/ConcurrentGattConnectTest.py
+++ b/acts_tests/tests/google/ble/concurrency/ConcurrentGattConnectTest.py
@@ -23,19 +23,19 @@
import concurrent.futures
import threading
import time
-from acts_contrib.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
-from acts_contrib.test_utils.bt.bt_constants import ble_scan_settings_modes
-from acts_contrib.test_utils.bt.bt_constants import ble_advertise_settings_modes
-from acts_contrib.test_utils.bt.bt_constants import bt_profile_constants
-from acts_contrib.test_utils.bt.bt_constants import gatt_characteristic
-from acts_contrib.test_utils.bt.bt_constants import gatt_characteristic_value_format
-from acts_contrib.test_utils.bt.bt_constants import gatt_char_desc_uuids
-from acts_contrib.test_utils.bt.bt_constants import gatt_descriptor
-from acts_contrib.test_utils.bt.bt_constants import gatt_service_types
-from acts_contrib.test_utils.bt.bt_constants import scan_result
-from acts_contrib.test_utils.bt.bt_gatt_utils import run_continuous_write_descriptor
-from acts_contrib.test_utils.bt.bt_gatt_utils import setup_gatt_connection
-from acts_contrib.test_utils.bt.gatts_lib import GattServerLib
+from acts.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
+from acts.test_utils.bt.bt_constants import ble_scan_settings_modes
+from acts.test_utils.bt.bt_constants import ble_advertise_settings_modes
+from acts.test_utils.bt.bt_constants import bt_profile_constants
+from acts.test_utils.bt.bt_constants import gatt_characteristic
+from acts.test_utils.bt.bt_constants import gatt_characteristic_value_format
+from acts.test_utils.bt.bt_constants import gatt_char_desc_uuids
+from acts.test_utils.bt.bt_constants import gatt_descriptor
+from acts.test_utils.bt.bt_constants import gatt_service_types
+from acts.test_utils.bt.bt_constants import scan_result
+from acts.test_utils.bt.bt_gatt_utils import run_continuous_write_descriptor
+from acts.test_utils.bt.bt_gatt_utils import setup_gatt_connection
+from acts.test_utils.bt.gatts_lib import GattServerLib
from acts.test_decorators import test_tracker_info
service_uuid = '0000a00a-0000-1000-8000-00805f9b34fb'
diff --git a/acts_tests/tests/google/ble/conn_oriented_chan/BleCoc2ConnTest.py b/acts_tests/tests/google/ble/conn_oriented_chan/BleCoc2ConnTest.py
index 70dcb89..353f507 100644
--- a/acts_tests/tests/google/ble/conn_oriented_chan/BleCoc2ConnTest.py
+++ b/acts_tests/tests/google/ble/conn_oriented_chan/BleCoc2ConnTest.py
@@ -24,21 +24,21 @@
from acts import utils
from queue import Empty
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
-from acts_contrib.test_utils.bt.bt_coc_test_utils import orchestrate_coc_connection
-from acts_contrib.test_utils.bt.bt_coc_test_utils import do_multi_connection_throughput
-from acts_contrib.test_utils.bt.bt_constants import default_le_data_length
-from acts_contrib.test_utils.bt.bt_constants import default_bluetooth_socket_timeout_ms
-from acts_contrib.test_utils.bt.bt_constants import l2cap_coc_header_size
-from acts_contrib.test_utils.bt.bt_constants import l2cap_max_inactivity_delay_after_disconnect
-from acts_contrib.test_utils.bt.bt_constants import le_connection_event_time_step_ms
-from acts_contrib.test_utils.bt.bt_test_utils import clear_bonded_devices
-from acts_contrib.test_utils.bt.bt_test_utils import kill_bluetooth_process
-from acts_contrib.test_utils.bt.bt_test_utils import reset_bluetooth
-from acts_contrib.test_utils.bt.bt_test_utils import setup_multiple_devices_for_bt_test
-from acts_contrib.test_utils.bt.bt_test_utils import take_btsnoop_logs
-from acts_contrib.test_utils.bt.bt_test_utils import write_read_verify_data
-from acts_contrib.test_utils.bt.bt_test_utils import verify_server_and_client_connected
+from acts.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
+from acts.test_utils.bt.bt_coc_test_utils import orchestrate_coc_connection
+from acts.test_utils.bt.bt_coc_test_utils import do_multi_connection_throughput
+from acts.test_utils.bt.bt_constants import default_le_data_length
+from acts.test_utils.bt.bt_constants import default_bluetooth_socket_timeout_ms
+from acts.test_utils.bt.bt_constants import l2cap_coc_header_size
+from acts.test_utils.bt.bt_constants import l2cap_max_inactivity_delay_after_disconnect
+from acts.test_utils.bt.bt_constants import le_connection_event_time_step_ms
+from acts.test_utils.bt.bt_test_utils import clear_bonded_devices
+from acts.test_utils.bt.bt_test_utils import kill_bluetooth_process
+from acts.test_utils.bt.bt_test_utils import reset_bluetooth
+from acts.test_utils.bt.bt_test_utils import setup_multiple_devices_for_bt_test
+from acts.test_utils.bt.bt_test_utils import take_btsnoop_logs
+from acts.test_utils.bt.bt_test_utils import write_read_verify_data
+from acts.test_utils.bt.bt_test_utils import verify_server_and_client_connected
class BleCoc2ConnTest(BluetoothBaseTest):
diff --git a/acts_tests/tests/google/ble/conn_oriented_chan/BleCocTest.py b/acts_tests/tests/google/ble/conn_oriented_chan/BleCocTest.py
index 9e95dcb..166b848 100644
--- a/acts_tests/tests/google/ble/conn_oriented_chan/BleCocTest.py
+++ b/acts_tests/tests/google/ble/conn_oriented_chan/BleCocTest.py
@@ -24,19 +24,19 @@
from acts import utils
from queue import Empty
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
-from acts_contrib.test_utils.bt.bt_coc_test_utils import orchestrate_coc_connection
-from acts_contrib.test_utils.bt.bt_coc_test_utils import do_multi_connection_throughput
-from acts_contrib.test_utils.bt.bt_constants import default_le_data_length
-from acts_contrib.test_utils.bt.bt_constants import l2cap_coc_header_size
-from acts_contrib.test_utils.bt.bt_constants import l2cap_max_inactivity_delay_after_disconnect
-from acts_contrib.test_utils.bt.bt_test_utils import clear_bonded_devices
-from acts_contrib.test_utils.bt.bt_test_utils import kill_bluetooth_process
-from acts_contrib.test_utils.bt.bt_test_utils import reset_bluetooth
-from acts_contrib.test_utils.bt.bt_test_utils import setup_multiple_devices_for_bt_test
-from acts_contrib.test_utils.bt.bt_test_utils import take_btsnoop_logs
-from acts_contrib.test_utils.bt.bt_test_utils import write_read_verify_data
-from acts_contrib.test_utils.bt.bt_test_utils import verify_server_and_client_connected
+from acts.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
+from acts.test_utils.bt.bt_coc_test_utils import orchestrate_coc_connection
+from acts.test_utils.bt.bt_coc_test_utils import do_multi_connection_throughput
+from acts.test_utils.bt.bt_constants import default_le_data_length
+from acts.test_utils.bt.bt_constants import l2cap_coc_header_size
+from acts.test_utils.bt.bt_constants import l2cap_max_inactivity_delay_after_disconnect
+from acts.test_utils.bt.bt_test_utils import clear_bonded_devices
+from acts.test_utils.bt.bt_test_utils import kill_bluetooth_process
+from acts.test_utils.bt.bt_test_utils import reset_bluetooth
+from acts.test_utils.bt.bt_test_utils import setup_multiple_devices_for_bt_test
+from acts.test_utils.bt.bt_test_utils import take_btsnoop_logs
+from acts.test_utils.bt.bt_test_utils import write_read_verify_data
+from acts.test_utils.bt.bt_test_utils import verify_server_and_client_connected
class BleCocTest(BluetoothBaseTest):
diff --git a/acts_tests/tests/google/ble/examples/BleExamplesTest.py b/acts_tests/tests/google/ble/examples/BleExamplesTest.py
index a9ec058..1ced2db 100644
--- a/acts_tests/tests/google/ble/examples/BleExamplesTest.py
+++ b/acts_tests/tests/google/ble/examples/BleExamplesTest.py
@@ -20,11 +20,11 @@
import pprint
from acts.controllers import android_device
-from acts_contrib.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
-from acts_contrib.test_utils.bt.bt_constants import adv_succ
-from acts_contrib.test_utils.bt.bt_constants import scan_result
-from acts_contrib.test_utils.bt.bt_test_utils import cleanup_scanners_and_advertisers
-from acts_contrib.test_utils.bt.bt_test_utils import reset_bluetooth
+from acts.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
+from acts.test_utils.bt.bt_constants import adv_succ
+from acts.test_utils.bt.bt_constants import scan_result
+from acts.test_utils.bt.bt_test_utils import cleanup_scanners_and_advertisers
+from acts.test_utils.bt.bt_test_utils import reset_bluetooth
class BleExamplesTest(BluetoothBaseTest):
diff --git a/acts_tests/tests/google/ble/examples/GattServerExampleTest.py b/acts_tests/tests/google/ble/examples/GattServerExampleTest.py
index 7ffcebb..e1f6476 100644
--- a/acts_tests/tests/google/ble/examples/GattServerExampleTest.py
+++ b/acts_tests/tests/google/ble/examples/GattServerExampleTest.py
@@ -14,13 +14,13 @@
# License for the specific language governing permissions and limitations under
# the License.
-from acts_contrib.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
-from acts_contrib.test_utils.bt.bt_constants import gatt_characteristic
-from acts_contrib.test_utils.bt.bt_constants import gatt_descriptor
-from acts_contrib.test_utils.bt.bt_constants import gatt_service_types
-from acts_contrib.test_utils.bt.bt_constants import gatt_characteristic_value_format
-from acts_contrib.test_utils.bt.bt_constants import gatt_char_desc_uuids
-from acts_contrib.test_utils.bt.gatts_lib import GattServerLib
+from acts.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
+from acts.test_utils.bt.bt_constants import gatt_characteristic
+from acts.test_utils.bt.bt_constants import gatt_descriptor
+from acts.test_utils.bt.bt_constants import gatt_service_types
+from acts.test_utils.bt.bt_constants import gatt_characteristic_value_format
+from acts.test_utils.bt.bt_constants import gatt_char_desc_uuids
+from acts.test_utils.bt.gatts_lib import GattServerLib
service_uuid = '0000a00a-0000-1000-8000-00805f9b34fb'
characteristic_uuid = 'aa7edd5a-4d1d-4f0e-883a-d145616a1630'
diff --git a/acts_tests/tests/google/ble/filtering/FilteringTest.py b/acts_tests/tests/google/ble/filtering/FilteringTest.py
index 0e898c8..d1bdc39 100644
--- a/acts_tests/tests/google/ble/filtering/FilteringTest.py
+++ b/acts_tests/tests/google/ble/filtering/FilteringTest.py
@@ -20,18 +20,18 @@
from queue import Empty
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
-from acts_contrib.test_utils.bt.bt_constants import ble_advertise_settings_modes
-from acts_contrib.test_utils.bt.bt_constants import ble_advertise_settings_tx_powers
-from acts_contrib.test_utils.bt.bt_constants import java_integer
-from acts_contrib.test_utils.bt.bt_constants import ble_scan_settings_modes
-from acts_contrib.test_utils.bt.bt_constants import ble_scan_settings_modes
-from acts_contrib.test_utils.bt.bt_constants import small_timeout
-from acts_contrib.test_utils.bt.bt_constants import adv_fail
-from acts_contrib.test_utils.bt.bt_constants import adv_succ
-from acts_contrib.test_utils.bt.bt_test_utils import generate_ble_advertise_objects
-from acts_contrib.test_utils.bt.bt_test_utils import reset_bluetooth
-from acts_contrib.test_utils.bt.bt_constants import scan_result
+from acts.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
+from acts.test_utils.bt.bt_constants import ble_advertise_settings_modes
+from acts.test_utils.bt.bt_constants import ble_advertise_settings_tx_powers
+from acts.test_utils.bt.bt_constants import java_integer
+from acts.test_utils.bt.bt_constants import ble_scan_settings_modes
+from acts.test_utils.bt.bt_constants import ble_scan_settings_modes
+from acts.test_utils.bt.bt_constants import small_timeout
+from acts.test_utils.bt.bt_constants import adv_fail
+from acts.test_utils.bt.bt_constants import adv_succ
+from acts.test_utils.bt.bt_test_utils import generate_ble_advertise_objects
+from acts.test_utils.bt.bt_test_utils import reset_bluetooth
+from acts.test_utils.bt.bt_constants import scan_result
class FilteringTest(BluetoothBaseTest):
diff --git a/acts_tests/tests/google/ble/filtering/UniqueFilteringTest.py b/acts_tests/tests/google/ble/filtering/UniqueFilteringTest.py
index fa20a39..c2e837c 100644
--- a/acts_tests/tests/google/ble/filtering/UniqueFilteringTest.py
+++ b/acts_tests/tests/google/ble/filtering/UniqueFilteringTest.py
@@ -25,14 +25,14 @@
from queue import Empty
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
-from acts_contrib.test_utils.bt.bt_constants import ble_advertise_settings_modes
-from acts_contrib.test_utils.bt.bt_constants import ble_scan_settings_modes
-from acts_contrib.test_utils.bt.bt_test_utils import generate_ble_advertise_objects
-from acts_contrib.test_utils.bt.bt_test_utils import generate_ble_scan_objects
-from acts_contrib.test_utils.bt.bt_constants import adv_succ
-from acts_contrib.test_utils.bt.bt_constants import batch_scan_result
-from acts_contrib.test_utils.bt.bt_constants import scan_result
+from acts.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
+from acts.test_utils.bt.bt_constants import ble_advertise_settings_modes
+from acts.test_utils.bt.bt_constants import ble_scan_settings_modes
+from acts.test_utils.bt.bt_test_utils import generate_ble_advertise_objects
+from acts.test_utils.bt.bt_test_utils import generate_ble_scan_objects
+from acts.test_utils.bt.bt_constants import adv_succ
+from acts.test_utils.bt.bt_constants import batch_scan_result
+from acts.test_utils.bt.bt_constants import scan_result
class UniqueFilteringTest(BluetoothBaseTest):
diff --git a/acts_tests/tests/google/ble/gatt/GattConnectTest.py b/acts_tests/tests/google/ble/gatt/GattConnectTest.py
index ebe5714..52f3601 100644
--- a/acts_tests/tests/google/ble/gatt/GattConnectTest.py
+++ b/acts_tests/tests/google/ble/gatt/GattConnectTest.py
@@ -22,31 +22,31 @@
import time
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
-from acts_contrib.test_utils.bt.bt_constants import ble_advertise_settings_modes
-from acts_contrib.test_utils.bt.bt_constants import ble_scan_settings_modes
-from acts_contrib.test_utils.bt.bt_constants import ble_scan_settings_match_nums
-from acts_contrib.test_utils.bt.bt_constants import bt_profile_constants
-from acts_contrib.test_utils.bt.bt_constants import gatt_characteristic
-from acts_contrib.test_utils.bt.bt_constants import gatt_descriptor
-from acts_contrib.test_utils.bt.bt_constants import gatt_service_types
-from acts_contrib.test_utils.bt.bt_constants import gatt_cb_err
-from acts_contrib.test_utils.bt.bt_constants import gatt_cb_strings
-from acts_contrib.test_utils.bt.bt_constants import gatt_connection_state
-from acts_contrib.test_utils.bt.bt_constants import gatt_mtu_size
-from acts_contrib.test_utils.bt.bt_constants import gatt_phy_mask
-from acts_contrib.test_utils.bt.bt_constants import gatt_transport
-from acts_contrib.test_utils.bt.bt_constants import scan_result
-from acts_contrib.test_utils.bt.bt_gatt_utils import GattTestUtilsError
-from acts_contrib.test_utils.bt.bt_gatt_utils import disconnect_gatt_connection
-from acts_contrib.test_utils.bt.bt_gatt_utils import wait_for_gatt_disconnect_event
-from acts_contrib.test_utils.bt.bt_gatt_utils import close_gatt_client
-from acts_contrib.test_utils.bt.bt_gatt_utils import log_gatt_server_uuids
-from acts_contrib.test_utils.bt.bt_gatt_utils import orchestrate_gatt_connection
-from acts_contrib.test_utils.bt.bt_gatt_utils import setup_gatt_connection
-from acts_contrib.test_utils.bt.bt_gatt_utils import setup_multiple_services
-from acts_contrib.test_utils.bt.bt_test_utils import get_mac_address_of_generic_advertisement
-from acts_contrib.test_utils.bt.bt_test_utils import clear_bonded_devices
+from acts.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
+from acts.test_utils.bt.bt_constants import ble_advertise_settings_modes
+from acts.test_utils.bt.bt_constants import ble_scan_settings_modes
+from acts.test_utils.bt.bt_constants import ble_scan_settings_match_nums
+from acts.test_utils.bt.bt_constants import bt_profile_constants
+from acts.test_utils.bt.bt_constants import gatt_characteristic
+from acts.test_utils.bt.bt_constants import gatt_descriptor
+from acts.test_utils.bt.bt_constants import gatt_service_types
+from acts.test_utils.bt.bt_constants import gatt_cb_err
+from acts.test_utils.bt.bt_constants import gatt_cb_strings
+from acts.test_utils.bt.bt_constants import gatt_connection_state
+from acts.test_utils.bt.bt_constants import gatt_mtu_size
+from acts.test_utils.bt.bt_constants import gatt_phy_mask
+from acts.test_utils.bt.bt_constants import gatt_transport
+from acts.test_utils.bt.bt_constants import scan_result
+from acts.test_utils.bt.bt_gatt_utils import GattTestUtilsError
+from acts.test_utils.bt.bt_gatt_utils import disconnect_gatt_connection
+from acts.test_utils.bt.bt_gatt_utils import wait_for_gatt_disconnect_event
+from acts.test_utils.bt.bt_gatt_utils import close_gatt_client
+from acts.test_utils.bt.bt_gatt_utils import log_gatt_server_uuids
+from acts.test_utils.bt.bt_gatt_utils import orchestrate_gatt_connection
+from acts.test_utils.bt.bt_gatt_utils import setup_gatt_connection
+from acts.test_utils.bt.bt_gatt_utils import setup_multiple_services
+from acts.test_utils.bt.bt_test_utils import get_mac_address_of_generic_advertisement
+from acts.test_utils.bt.bt_test_utils import clear_bonded_devices
PHYSICAL_DISCONNECT_TIMEOUT = 5
diff --git a/acts_tests/tests/google/ble/gatt/GattNotifyTest.py b/acts_tests/tests/google/ble/gatt/GattNotifyTest.py
index 4b142a5..7d62d65 100644
--- a/acts_tests/tests/google/ble/gatt/GattNotifyTest.py
+++ b/acts_tests/tests/google/ble/gatt/GattNotifyTest.py
@@ -18,13 +18,13 @@
"""
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
-from acts_contrib.test_utils.bt.GattConnectedBaseTest import GattConnectedBaseTest
-from acts_contrib.test_utils.bt.bt_constants import gatt_characteristic
-from acts_contrib.test_utils.bt.bt_constants import gatt_descriptor
-from acts_contrib.test_utils.bt.bt_constants import gatt_event
-from acts_contrib.test_utils.bt.bt_constants import gatt_cb_strings
-from acts_contrib.test_utils.bt.bt_constants import gatt_char_desc_uuids
+from acts.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
+from acts.test_utils.bt.GattConnectedBaseTest import GattConnectedBaseTest
+from acts.test_utils.bt.bt_constants import gatt_characteristic
+from acts.test_utils.bt.bt_constants import gatt_descriptor
+from acts.test_utils.bt.bt_constants import gatt_event
+from acts.test_utils.bt.bt_constants import gatt_cb_strings
+from acts.test_utils.bt.bt_constants import gatt_char_desc_uuids
from math import ceil
diff --git a/acts_tests/tests/google/ble/gatt/GattReadTest.py b/acts_tests/tests/google/ble/gatt/GattReadTest.py
index 216f470..e880757 100644
--- a/acts_tests/tests/google/ble/gatt/GattReadTest.py
+++ b/acts_tests/tests/google/ble/gatt/GattReadTest.py
@@ -18,12 +18,12 @@
"""
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
-from acts_contrib.test_utils.bt.GattConnectedBaseTest import GattConnectedBaseTest
-from acts_contrib.test_utils.bt.bt_constants import gatt_characteristic
-from acts_contrib.test_utils.bt.bt_constants import gatt_descriptor
-from acts_contrib.test_utils.bt.bt_constants import gatt_event
-from acts_contrib.test_utils.bt.bt_constants import gatt_cb_strings
+from acts.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
+from acts.test_utils.bt.GattConnectedBaseTest import GattConnectedBaseTest
+from acts.test_utils.bt.bt_constants import gatt_characteristic
+from acts.test_utils.bt.bt_constants import gatt_descriptor
+from acts.test_utils.bt.bt_constants import gatt_event
+from acts.test_utils.bt.bt_constants import gatt_cb_strings
from math import ceil
diff --git a/acts_tests/tests/google/ble/gatt/GattToolTest.py b/acts_tests/tests/google/ble/gatt/GattToolTest.py
index 116495c..8e7a9f0 100644
--- a/acts_tests/tests/google/ble/gatt/GattToolTest.py
+++ b/acts_tests/tests/google/ble/gatt/GattToolTest.py
@@ -27,19 +27,19 @@
from queue import Empty
import time
-from acts_contrib.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
-from acts_contrib.test_utils.bt.bt_constants import ble_scan_settings_modes
-from acts_contrib.test_utils.bt.bt_constants import gatt_cb_err
-from acts_contrib.test_utils.bt.bt_constants import gatt_cb_strings
-from acts_contrib.test_utils.bt.bt_constants import gatt_descriptor
-from acts_contrib.test_utils.bt.bt_constants import gatt_transport
-from acts_contrib.test_utils.bt.bt_constants import scan_result
-from acts_contrib.test_utils.bt.bt_gatt_utils import GattTestUtilsError
-from acts_contrib.test_utils.bt.bt_gatt_utils import disconnect_gatt_connection
-from acts_contrib.test_utils.bt.bt_test_utils import generate_ble_scan_objects
-from acts_contrib.test_utils.bt.bt_gatt_utils import setup_gatt_connection
-from acts_contrib.test_utils.bt.bt_gatt_utils import log_gatt_server_uuids
-from acts_contrib.test_utils.bt.bt_test_utils import reset_bluetooth
+from acts.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
+from acts.test_utils.bt.bt_constants import ble_scan_settings_modes
+from acts.test_utils.bt.bt_constants import gatt_cb_err
+from acts.test_utils.bt.bt_constants import gatt_cb_strings
+from acts.test_utils.bt.bt_constants import gatt_descriptor
+from acts.test_utils.bt.bt_constants import gatt_transport
+from acts.test_utils.bt.bt_constants import scan_result
+from acts.test_utils.bt.bt_gatt_utils import GattTestUtilsError
+from acts.test_utils.bt.bt_gatt_utils import disconnect_gatt_connection
+from acts.test_utils.bt.bt_test_utils import generate_ble_scan_objects
+from acts.test_utils.bt.bt_gatt_utils import setup_gatt_connection
+from acts.test_utils.bt.bt_gatt_utils import log_gatt_server_uuids
+from acts.test_utils.bt.bt_test_utils import reset_bluetooth
class GattToolTest(BluetoothBaseTest):
diff --git a/acts_tests/tests/google/ble/gatt/GattWriteTest.py b/acts_tests/tests/google/ble/gatt/GattWriteTest.py
index 87e043a..d245e9e 100644
--- a/acts_tests/tests/google/ble/gatt/GattWriteTest.py
+++ b/acts_tests/tests/google/ble/gatt/GattWriteTest.py
@@ -18,16 +18,16 @@
"""
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
-from acts_contrib.test_utils.bt.GattConnectedBaseTest import GattConnectedBaseTest
-from acts_contrib.test_utils.bt.bt_constants import gatt_characteristic
-from acts_contrib.test_utils.bt.bt_constants import gatt_descriptor
-from acts_contrib.test_utils.bt.bt_constants import gatt_event
-from acts_contrib.test_utils.bt.bt_constants import gatt_cb_strings
-from acts_contrib.test_utils.bt.bt_constants import gatt_connection_priority
-from acts_contrib.test_utils.bt.bt_constants import gatt_characteristic_attr_length
-from acts_contrib.test_utils.bt.bt_constants import gatt_mtu_size
-from acts_contrib.test_utils.bt.bt_gatt_utils import setup_gatt_mtu
+from acts.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
+from acts.test_utils.bt.GattConnectedBaseTest import GattConnectedBaseTest
+from acts.test_utils.bt.bt_constants import gatt_characteristic
+from acts.test_utils.bt.bt_constants import gatt_descriptor
+from acts.test_utils.bt.bt_constants import gatt_event
+from acts.test_utils.bt.bt_constants import gatt_cb_strings
+from acts.test_utils.bt.bt_constants import gatt_connection_priority
+from acts.test_utils.bt.bt_constants import gatt_characteristic_attr_length
+from acts.test_utils.bt.bt_constants import gatt_mtu_size
+from acts.test_utils.bt.bt_gatt_utils import setup_gatt_mtu
class GattWriteTest(GattConnectedBaseTest):
diff --git a/acts_tests/tests/google/ble/scan/BleBackgroundScanTest.py b/acts_tests/tests/google/ble/scan/BleBackgroundScanTest.py
index 533d9fa..6839602 100644
--- a/acts_tests/tests/google/ble/scan/BleBackgroundScanTest.py
+++ b/acts_tests/tests/google/ble/scan/BleBackgroundScanTest.py
@@ -21,18 +21,18 @@
from acts import utils
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
-from acts_contrib.test_utils.bt.bt_test_utils import bluetooth_off
-from acts_contrib.test_utils.bt.bt_test_utils import bluetooth_on
-from acts_contrib.test_utils.bt.bt_test_utils import cleanup_scanners_and_advertisers
-from acts_contrib.test_utils.bt.bt_test_utils import enable_bluetooth
-from acts_contrib.test_utils.bt.bt_test_utils import generate_ble_advertise_objects
-from acts_contrib.test_utils.bt.bt_test_utils import generate_ble_scan_objects
-from acts_contrib.test_utils.bt.bt_constants import bluetooth_le_off
-from acts_contrib.test_utils.bt.bt_constants import bluetooth_le_on
-from acts_contrib.test_utils.bt.bt_constants import bt_adapter_states
-from acts_contrib.test_utils.bt.bt_constants import ble_scan_settings_modes
-from acts_contrib.test_utils.bt.bt_constants import scan_result
+from acts.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
+from acts.test_utils.bt.bt_test_utils import bluetooth_off
+from acts.test_utils.bt.bt_test_utils import bluetooth_on
+from acts.test_utils.bt.bt_test_utils import cleanup_scanners_and_advertisers
+from acts.test_utils.bt.bt_test_utils import enable_bluetooth
+from acts.test_utils.bt.bt_test_utils import generate_ble_advertise_objects
+from acts.test_utils.bt.bt_test_utils import generate_ble_scan_objects
+from acts.test_utils.bt.bt_constants import bluetooth_le_off
+from acts.test_utils.bt.bt_constants import bluetooth_le_on
+from acts.test_utils.bt.bt_constants import bt_adapter_states
+from acts.test_utils.bt.bt_constants import ble_scan_settings_modes
+from acts.test_utils.bt.bt_constants import scan_result
import time
diff --git a/acts_tests/tests/google/ble/scan/BleOnLostOnFoundTest.py b/acts_tests/tests/google/ble/scan/BleOnLostOnFoundTest.py
index 6926c6a..01f7976 100644
--- a/acts_tests/tests/google/ble/scan/BleOnLostOnFoundTest.py
+++ b/acts_tests/tests/google/ble/scan/BleOnLostOnFoundTest.py
@@ -20,18 +20,18 @@
from queue import Empty
from acts import utils
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
-from acts_contrib.test_utils.bt.bt_constants import ble_advertise_settings_modes
-from acts_contrib.test_utils.bt.bt_constants import ble_scan_settings_callback_types
-from acts_contrib.test_utils.bt.BleEnum import ScanSettingsMatchMode
-from acts_contrib.test_utils.bt.BleEnum import ScanSettingsMatchNum
-from acts_contrib.test_utils.bt.bt_constants import ble_scan_settings_modes
-from acts_contrib.test_utils.bt.bt_constants import ble_scan_settings_match_modes
-from acts_contrib.test_utils.bt.bt_constants import ble_scan_settings_match_nums
-from acts_contrib.test_utils.bt.bt_constants import adv_succ
-from acts_contrib.test_utils.bt.bt_test_utils import cleanup_scanners_and_advertisers
-from acts_contrib.test_utils.bt.bt_test_utils import reset_bluetooth
-from acts_contrib.test_utils.bt.bt_constants import scan_result
+from acts.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
+from acts.test_utils.bt.bt_constants import ble_advertise_settings_modes
+from acts.test_utils.bt.bt_constants import ble_scan_settings_callback_types
+from acts.test_utils.bt.BleEnum import ScanSettingsMatchMode
+from acts.test_utils.bt.BleEnum import ScanSettingsMatchNum
+from acts.test_utils.bt.bt_constants import ble_scan_settings_modes
+from acts.test_utils.bt.bt_constants import ble_scan_settings_match_modes
+from acts.test_utils.bt.bt_constants import ble_scan_settings_match_nums
+from acts.test_utils.bt.bt_constants import adv_succ
+from acts.test_utils.bt.bt_test_utils import cleanup_scanners_and_advertisers
+from acts.test_utils.bt.bt_test_utils import reset_bluetooth
+from acts.test_utils.bt.bt_constants import scan_result
class BleOnLostOnFoundTest(BluetoothBaseTest):
diff --git a/acts_tests/tests/google/ble/scan/BleOpportunisticScanTest.py b/acts_tests/tests/google/ble/scan/BleOpportunisticScanTest.py
index 570dd1e..9e59128 100644
--- a/acts_tests/tests/google/ble/scan/BleOpportunisticScanTest.py
+++ b/acts_tests/tests/google/ble/scan/BleOpportunisticScanTest.py
@@ -25,15 +25,15 @@
from acts import utils
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
-from acts_contrib.test_utils.bt.bt_constants import ble_scan_settings_modes
-from acts_contrib.test_utils.bt.bt_constants import ble_scan_settings_modes
-from acts_contrib.test_utils.bt.bt_constants import batch_scan_result
-from acts_contrib.test_utils.bt.bt_test_utils import cleanup_scanners_and_advertisers
-from acts_contrib.test_utils.bt.bt_test_utils import generate_ble_advertise_objects
-from acts_contrib.test_utils.bt.bt_test_utils import generate_ble_scan_objects
-from acts_contrib.test_utils.bt.bt_test_utils import reset_bluetooth
-from acts_contrib.test_utils.bt.bt_constants import scan_result
+from acts.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
+from acts.test_utils.bt.bt_constants import ble_scan_settings_modes
+from acts.test_utils.bt.bt_constants import ble_scan_settings_modes
+from acts.test_utils.bt.bt_constants import batch_scan_result
+from acts.test_utils.bt.bt_test_utils import cleanup_scanners_and_advertisers
+from acts.test_utils.bt.bt_test_utils import generate_ble_advertise_objects
+from acts.test_utils.bt.bt_test_utils import generate_ble_scan_objects
+from acts.test_utils.bt.bt_test_utils import reset_bluetooth
+from acts.test_utils.bt.bt_constants import scan_result
class BleOpportunisticScanTest(BluetoothBaseTest):
diff --git a/acts_tests/tests/google/ble/scan/BleScanScreenStateTest.py b/acts_tests/tests/google/ble/scan/BleScanScreenStateTest.py
index a19e80c..07ae898 100644
--- a/acts_tests/tests/google/ble/scan/BleScanScreenStateTest.py
+++ b/acts_tests/tests/google/ble/scan/BleScanScreenStateTest.py
@@ -25,15 +25,15 @@
from queue import Empty
from acts import utils
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
-from acts_contrib.test_utils.bt.bt_constants import adv_succ
-from acts_contrib.test_utils.bt.bt_constants import ble_advertise_settings_modes
-from acts_contrib.test_utils.bt.bt_constants import ble_scan_settings_modes
-from acts_contrib.test_utils.bt.bt_constants import bt_default_timeout
-from acts_contrib.test_utils.bt.bt_constants import scan_result
-from acts_contrib.test_utils.bt.bt_test_utils import generate_ble_advertise_objects
-from acts_contrib.test_utils.bt.bt_test_utils import generate_ble_scan_objects
-from acts_contrib.test_utils.bt.bt_test_utils import reset_bluetooth
+from acts.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
+from acts.test_utils.bt.bt_constants import adv_succ
+from acts.test_utils.bt.bt_constants import ble_advertise_settings_modes
+from acts.test_utils.bt.bt_constants import ble_scan_settings_modes
+from acts.test_utils.bt.bt_constants import bt_default_timeout
+from acts.test_utils.bt.bt_constants import scan_result
+from acts.test_utils.bt.bt_test_utils import generate_ble_advertise_objects
+from acts.test_utils.bt.bt_test_utils import generate_ble_scan_objects
+from acts.test_utils.bt.bt_test_utils import reset_bluetooth
class BleScanScreenStateTest(BluetoothBaseTest):
diff --git a/acts_tests/tests/google/ble/system_tests/BleStressTest.py b/acts_tests/tests/google/ble/system_tests/BleStressTest.py
index 721ef6c..afbb67a 100644
--- a/acts_tests/tests/google/ble/system_tests/BleStressTest.py
+++ b/acts_tests/tests/google/ble/system_tests/BleStressTest.py
@@ -23,15 +23,15 @@
from queue import Empty
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
-from acts_contrib.test_utils.bt.bt_test_utils import BtTestUtilsError
-from acts_contrib.test_utils.bt.bt_test_utils import clear_bonded_devices
-from acts_contrib.test_utils.bt.bt_test_utils import generate_ble_advertise_objects
-from acts_contrib.test_utils.bt.bt_test_utils import generate_ble_scan_objects
-from acts_contrib.test_utils.bt.bt_test_utils import get_advanced_droid_list
-from acts_contrib.test_utils.bt.bt_test_utils import get_mac_address_of_generic_advertisement
-from acts_contrib.test_utils.bt.bt_test_utils import reset_bluetooth
-from acts_contrib.test_utils.bt.bt_constants import scan_result
+from acts.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
+from acts.test_utils.bt.bt_test_utils import BtTestUtilsError
+from acts.test_utils.bt.bt_test_utils import clear_bonded_devices
+from acts.test_utils.bt.bt_test_utils import generate_ble_advertise_objects
+from acts.test_utils.bt.bt_test_utils import generate_ble_scan_objects
+from acts.test_utils.bt.bt_test_utils import get_advanced_droid_list
+from acts.test_utils.bt.bt_test_utils import get_mac_address_of_generic_advertisement
+from acts.test_utils.bt.bt_test_utils import reset_bluetooth
+from acts.test_utils.bt.bt_constants import scan_result
class BleStressTest(BluetoothBaseTest):
diff --git a/acts_tests/tests/google/ble/system_tests/GattLongevityTest.py b/acts_tests/tests/google/ble/system_tests/GattLongevityTest.py
index 88b1774..bb13646 100644
--- a/acts_tests/tests/google/ble/system_tests/GattLongevityTest.py
+++ b/acts_tests/tests/google/ble/system_tests/GattLongevityTest.py
@@ -18,16 +18,16 @@
"""
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
-from acts_contrib.test_utils.bt.GattConnectedBaseTest import GattConnectedBaseTest
-from acts_contrib.test_utils.bt.bt_constants import gatt_characteristic
-from acts_contrib.test_utils.bt.bt_constants import gatt_descriptor
-from acts_contrib.test_utils.bt.bt_constants import gatt_event
-from acts_contrib.test_utils.bt.bt_constants import gatt_cb_strings
-from acts_contrib.test_utils.bt.bt_constants import gatt_connection_priority
-from acts_contrib.test_utils.bt.bt_constants import gatt_characteristic_attr_length
-from acts_contrib.test_utils.bt.GattEnum import MtuSize
-from acts_contrib.test_utils.bt.bt_gatt_utils import setup_gatt_mtu
+from acts.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
+from acts.test_utils.bt.GattConnectedBaseTest import GattConnectedBaseTest
+from acts.test_utils.bt.bt_constants import gatt_characteristic
+from acts.test_utils.bt.bt_constants import gatt_descriptor
+from acts.test_utils.bt.bt_constants import gatt_event
+from acts.test_utils.bt.bt_constants import gatt_cb_strings
+from acts.test_utils.bt.bt_constants import gatt_connection_priority
+from acts.test_utils.bt.bt_constants import gatt_characteristic_attr_length
+from acts.test_utils.bt.GattEnum import MtuSize
+from acts.test_utils.bt.bt_gatt_utils import setup_gatt_mtu
class GattLongevityTest(GattConnectedBaseTest):
diff --git a/acts_tests/tests/google/bt/AkXB10PairingTest.py b/acts_tests/tests/google/bt/AkXB10PairingTest.py
index 99e7529..10e7335 100644
--- a/acts_tests/tests/google/bt/AkXB10PairingTest.py
+++ b/acts_tests/tests/google/bt/AkXB10PairingTest.py
@@ -20,7 +20,7 @@
import time
from acts.controllers.relay_lib.relay import SynchronizeRelays
-from acts_contrib.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
+from acts.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
log = logging
diff --git a/acts_tests/tests/google/bt/BtAirplaneModeTest.py b/acts_tests/tests/google/bt/BtAirplaneModeTest.py
index aeafc7a..e2dd7eb 100644
--- a/acts_tests/tests/google/bt/BtAirplaneModeTest.py
+++ b/acts_tests/tests/google/bt/BtAirplaneModeTest.py
@@ -19,9 +19,9 @@
"""
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
-from acts_contrib.test_utils.bt.bt_test_utils import bluetooth_enabled_check
-from acts_contrib.test_utils.tel.tel_test_utils import toggle_airplane_mode_by_adb
+from acts.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
+from acts.test_utils.bt.bt_test_utils import bluetooth_enabled_check
+from acts.test_utils.tel.tel_test_utils import toggle_airplane_mode_by_adb
from queue import Empty
import time
diff --git a/acts_tests/tests/google/bt/BtBasicFunctionalityTest.py b/acts_tests/tests/google/bt/BtBasicFunctionalityTest.py
index ade4c0a..3194d76 100644
--- a/acts_tests/tests/google/bt/BtBasicFunctionalityTest.py
+++ b/acts_tests/tests/google/bt/BtBasicFunctionalityTest.py
@@ -22,14 +22,14 @@
from queue import Empty
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
-from acts_contrib.test_utils.bt.bt_constants import bt_scan_mode_types
-from acts_contrib.test_utils.bt.bt_test_utils import check_device_supported_profiles
-from acts_contrib.test_utils.bt.bt_test_utils import reset_bluetooth
-from acts_contrib.test_utils.bt.bt_test_utils import set_device_name
-from acts_contrib.test_utils.bt.bt_test_utils import set_bt_scan_mode
-from acts_contrib.test_utils.bt.bt_test_utils import setup_multiple_devices_for_bt_test
-from acts_contrib.test_utils.bt.bt_test_utils import take_btsnoop_logs
+from acts.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
+from acts.test_utils.bt.bt_constants import bt_scan_mode_types
+from acts.test_utils.bt.bt_test_utils import check_device_supported_profiles
+from acts.test_utils.bt.bt_test_utils import reset_bluetooth
+from acts.test_utils.bt.bt_test_utils import set_device_name
+from acts.test_utils.bt.bt_test_utils import set_bt_scan_mode
+from acts.test_utils.bt.bt_test_utils import setup_multiple_devices_for_bt_test
+from acts.test_utils.bt.bt_test_utils import take_btsnoop_logs
class BtBasicFunctionalityTest(BluetoothBaseTest):
diff --git a/acts_tests/tests/google/bt/BtFactoryResetTest.py b/acts_tests/tests/google/bt/BtFactoryResetTest.py
index 49ea0e0..f33b210 100644
--- a/acts_tests/tests/google/bt/BtFactoryResetTest.py
+++ b/acts_tests/tests/google/bt/BtFactoryResetTest.py
@@ -17,8 +17,8 @@
Test script to test BluetoothAdapter's resetFactory method.
"""
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
-from acts_contrib.test_utils.bt.bt_test_utils import pair_pri_to_sec
+from acts.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
+from acts.test_utils.bt.bt_test_utils import pair_pri_to_sec
class BtFactoryResetTest(BluetoothBaseTest):
diff --git a/acts_tests/tests/google/bt/BtKillProcessTest.py b/acts_tests/tests/google/bt/BtKillProcessTest.py
index b5adc77..ed53e20 100644
--- a/acts_tests/tests/google/bt/BtKillProcessTest.py
+++ b/acts_tests/tests/google/bt/BtKillProcessTest.py
@@ -21,7 +21,7 @@
import re
import time
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
+from acts.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
class BtKillProcessTest(BluetoothBaseTest):
diff --git a/acts_tests/tests/google/bt/BtMetricsTest.py b/acts_tests/tests/google/bt/BtMetricsTest.py
index 42a6da3..37d4150 100644
--- a/acts_tests/tests/google/bt/BtMetricsTest.py
+++ b/acts_tests/tests/google/bt/BtMetricsTest.py
@@ -16,11 +16,11 @@
from google import protobuf
from acts import asserts
-from acts_contrib.test_utils.bt.BtMetricsBaseTest import BtMetricsBaseTest
-from acts_contrib.test_utils.bt.bt_test_utils import clear_bonded_devices
-from acts_contrib.test_utils.bt.bt_test_utils import pair_pri_to_sec
-from acts_contrib.test_utils.bt.bt_test_utils import reset_bluetooth
-from acts_contrib.test_utils.bt.protos import bluetooth_pb2
+from acts.test_utils.bt.BtMetricsBaseTest import BtMetricsBaseTest
+from acts.test_utils.bt.bt_test_utils import clear_bonded_devices
+from acts.test_utils.bt.bt_test_utils import pair_pri_to_sec
+from acts.test_utils.bt.bt_test_utils import reset_bluetooth
+from acts.test_utils.bt.protos import bluetooth_pb2
from acts.utils import get_current_epoch_time, sync_device_time
diff --git a/acts_tests/tests/google/bt/RfcommTest.py b/acts_tests/tests/google/bt/RfcommTest.py
index 14dc7bb..58de1be 100644
--- a/acts_tests/tests/google/bt/RfcommTest.py
+++ b/acts_tests/tests/google/bt/RfcommTest.py
@@ -23,18 +23,18 @@
from queue import Empty
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
-from acts_contrib.test_utils.bt.bt_constants import bt_rfcomm_uuids
-from acts_contrib.test_utils.bt.bt_test_utils import clear_bonded_devices
-from acts_contrib.test_utils.bt.bt_test_utils import kill_bluetooth_process
-from acts_contrib.test_utils.bt.bt_test_utils import orchestrate_rfcomm_connection
-from acts_contrib.test_utils.bt.bt_test_utils import reset_bluetooth
-from acts_contrib.test_utils.bt.bt_test_utils import setup_multiple_devices_for_bt_test
-from acts_contrib.test_utils.bt.bt_test_utils import take_btsnoop_logs
-from acts_contrib.test_utils.bt.bt_test_utils import write_read_verify_data
-from acts_contrib.test_utils.bt.bt_test_utils import verify_server_and_client_connected
+from acts.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
+from acts.test_utils.bt.bt_constants import bt_rfcomm_uuids
+from acts.test_utils.bt.bt_test_utils import clear_bonded_devices
+from acts.test_utils.bt.bt_test_utils import kill_bluetooth_process
+from acts.test_utils.bt.bt_test_utils import orchestrate_rfcomm_connection
+from acts.test_utils.bt.bt_test_utils import reset_bluetooth
+from acts.test_utils.bt.bt_test_utils import setup_multiple_devices_for_bt_test
+from acts.test_utils.bt.bt_test_utils import take_btsnoop_logs
+from acts.test_utils.bt.bt_test_utils import write_read_verify_data
+from acts.test_utils.bt.bt_test_utils import verify_server_and_client_connected
-from acts_contrib.test_utils.bt.BtEnum import RfcommUuid
+from acts.test_utils.bt.BtEnum import RfcommUuid
class RfcommTest(BluetoothBaseTest):
diff --git a/acts_tests/tests/google/bt/SonyXB2PairingTest.py b/acts_tests/tests/google/bt/SonyXB2PairingTest.py
index 795914e..4dcf863 100644
--- a/acts_tests/tests/google/bt/SonyXB2PairingTest.py
+++ b/acts_tests/tests/google/bt/SonyXB2PairingTest.py
@@ -20,7 +20,7 @@
import time
from acts.controllers.relay_lib.relay import SynchronizeRelays
-from acts_contrib.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
+from acts.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
log = logging
diff --git a/acts_tests/tests/google/bt/audio_lab/BtChameleonTest.py b/acts_tests/tests/google/bt/audio_lab/BtChameleonTest.py
index 3a0be9d..1e76729 100644
--- a/acts_tests/tests/google/bt/audio_lab/BtChameleonTest.py
+++ b/acts_tests/tests/google/bt/audio_lab/BtChameleonTest.py
@@ -27,16 +27,16 @@
import time
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.audio_analysis_lib.check_quality import quality_analysis
-from acts_contrib.test_utils.bt.BtFunhausBaseTest import BtFunhausBaseTest
-from acts_contrib.test_utils.bt.bt_constants import audio_bits_per_sample_32
-from acts_contrib.test_utils.bt.bt_constants import audio_channel_mode_8
-from acts_contrib.test_utils.bt.bt_constants import audio_sample_rate_48000
-from acts_contrib.test_utils.bt.bt_constants import delay_after_binding_seconds
-from acts_contrib.test_utils.bt.bt_constants import delay_before_record_seconds
-from acts_contrib.test_utils.bt.bt_constants import fpga_linein_bus_endpoint
-from acts_contrib.test_utils.bt.bt_constants import headphone_bus_endpoint
-from acts_contrib.test_utils.bt.bt_constants import silence_wait_seconds
+from acts.test_utils.audio_analysis_lib.check_quality import quality_analysis
+from acts.test_utils.bt.BtFunhausBaseTest import BtFunhausBaseTest
+from acts.test_utils.bt.bt_constants import audio_bits_per_sample_32
+from acts.test_utils.bt.bt_constants import audio_channel_mode_8
+from acts.test_utils.bt.bt_constants import audio_sample_rate_48000
+from acts.test_utils.bt.bt_constants import delay_after_binding_seconds
+from acts.test_utils.bt.bt_constants import delay_before_record_seconds
+from acts.test_utils.bt.bt_constants import fpga_linein_bus_endpoint
+from acts.test_utils.bt.bt_constants import headphone_bus_endpoint
+from acts.test_utils.bt.bt_constants import silence_wait_seconds
class BtChameleonTest(BtFunhausBaseTest):
diff --git a/acts_tests/tests/google/bt/audio_lab/BtFunhausMetricsTest.py b/acts_tests/tests/google/bt/audio_lab/BtFunhausMetricsTest.py
index 84166e9..c734191 100644
--- a/acts_tests/tests/google/bt/audio_lab/BtFunhausMetricsTest.py
+++ b/acts_tests/tests/google/bt/audio_lab/BtFunhausMetricsTest.py
@@ -15,7 +15,7 @@
from acts.test_decorators import test_tracker_info
from acts import asserts
-from acts_contrib.test_utils.bt.BtFunhausBaseTest import BtFunhausBaseTest
+from acts.test_utils.bt.BtFunhausBaseTest import BtFunhausBaseTest
class BtFunhausMetricsTest(BtFunhausBaseTest):
diff --git a/acts_tests/tests/google/bt/audio_lab/BtFunhausTest.py b/acts_tests/tests/google/bt/audio_lab/BtFunhausTest.py
index 20363f9..42cbc22 100644
--- a/acts_tests/tests/google/bt/audio_lab/BtFunhausTest.py
+++ b/acts_tests/tests/google/bt/audio_lab/BtFunhausTest.py
@@ -19,7 +19,7 @@
import time
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.bt.BtFunhausBaseTest import BtFunhausBaseTest
+from acts.test_utils.bt.BtFunhausBaseTest import BtFunhausBaseTest
class BtFunhausTest(BtFunhausBaseTest):
diff --git a/acts_tests/tests/google/bt/audio_lab/ThreeButtonDongleTest.py b/acts_tests/tests/google/bt/audio_lab/ThreeButtonDongleTest.py
index 4c032fd..abf97be 100644
--- a/acts_tests/tests/google/bt/audio_lab/ThreeButtonDongleTest.py
+++ b/acts_tests/tests/google/bt/audio_lab/ThreeButtonDongleTest.py
@@ -19,8 +19,8 @@
import time
from acts.controllers.relay_lib.relay import SynchronizeRelays
-from acts_contrib.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
-from acts_contrib.test_utils.bt.bt_test_utils import clear_bonded_devices
+from acts.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
+from acts.test_utils.bt.bt_test_utils import clear_bonded_devices
class ThreeButtonDongleTest(BluetoothBaseTest):
diff --git a/acts_tests/tests/google/bt/avrcp/BtAvrcpPassthroughTest.py b/acts_tests/tests/google/bt/avrcp/BtAvrcpPassthroughTest.py
index a0c82ac..496db44 100644
--- a/acts_tests/tests/google/bt/avrcp/BtAvrcpPassthroughTest.py
+++ b/acts_tests/tests/google/bt/avrcp/BtAvrcpPassthroughTest.py
@@ -17,8 +17,8 @@
import time
from acts.asserts import assert_equal
-from acts_contrib.test_utils.bt.AvrcpBaseTest import AvrcpBaseTest
-from acts_contrib.test_utils.car.car_media_utils import PlaybackState
+from acts.test_utils.bt.AvrcpBaseTest import AvrcpBaseTest
+from acts.test_utils.car.car_media_utils import PlaybackState
DEFAULT_TIMEOUT = 0.5
diff --git a/acts_tests/tests/google/bt/car_bt/BtCarBasicFunctionalityTest.py b/acts_tests/tests/google/bt/car_bt/BtCarBasicFunctionalityTest.py
index b8d5ec8..99f2851 100644
--- a/acts_tests/tests/google/bt/car_bt/BtCarBasicFunctionalityTest.py
+++ b/acts_tests/tests/google/bt/car_bt/BtCarBasicFunctionalityTest.py
@@ -21,15 +21,15 @@
from queue import Empty
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
-from acts_contrib.test_utils.bt.BtEnum import BluetoothScanModeType
-from acts_contrib.test_utils.bt.bt_test_utils import check_device_supported_profiles
-from acts_contrib.test_utils.bt.bt_test_utils import log_energy_info
-from acts_contrib.test_utils.bt.bt_test_utils import reset_bluetooth
-from acts_contrib.test_utils.bt.bt_test_utils import set_device_name
-from acts_contrib.test_utils.bt.bt_test_utils import set_bt_scan_mode
-from acts_contrib.test_utils.bt.bt_test_utils import setup_multiple_devices_for_bt_test
-from acts_contrib.test_utils.bt.bt_test_utils import take_btsnoop_logs
+from acts.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
+from acts.test_utils.bt.BtEnum import BluetoothScanModeType
+from acts.test_utils.bt.bt_test_utils import check_device_supported_profiles
+from acts.test_utils.bt.bt_test_utils import log_energy_info
+from acts.test_utils.bt.bt_test_utils import reset_bluetooth
+from acts.test_utils.bt.bt_test_utils import set_device_name
+from acts.test_utils.bt.bt_test_utils import set_bt_scan_mode
+from acts.test_utils.bt.bt_test_utils import setup_multiple_devices_for_bt_test
+from acts.test_utils.bt.bt_test_utils import take_btsnoop_logs
class BtCarBasicFunctionalityTest(BluetoothBaseTest):
diff --git a/acts_tests/tests/google/bt/car_bt/BtCarHfpConferenceTest.py b/acts_tests/tests/google/bt/car_bt/BtCarHfpConferenceTest.py
index edb9683..6a12e8f 100644
--- a/acts_tests/tests/google/bt/car_bt/BtCarHfpConferenceTest.py
+++ b/acts_tests/tests/google/bt/car_bt/BtCarHfpConferenceTest.py
@@ -20,19 +20,19 @@
import time
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
-from acts_contrib.test_utils.bt.BluetoothCarHfpBaseTest import BluetoothCarHfpBaseTest
-from acts_contrib.test_utils.bt import BtEnum
-from acts_contrib.test_utils.bt import bt_test_utils
-from acts_contrib.test_utils.car import car_telecom_utils
-from acts_contrib.test_utils.tel import tel_defines
-from acts_contrib.test_utils.tel.tel_test_utils import hangup_call
-from acts_contrib.test_utils.tel.tel_test_utils import initiate_call
-from acts_contrib.test_utils.tel.tel_test_utils import wait_and_answer_call
-from acts_contrib.test_utils.tel.tel_test_utils import wait_for_ringing_call
-from acts_contrib.test_utils.tel.tel_voice_utils import get_audio_route
-from acts_contrib.test_utils.tel.tel_voice_utils import set_audio_route
-from acts_contrib.test_utils.tel.tel_voice_utils import swap_calls
+from acts.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
+from acts.test_utils.bt.BluetoothCarHfpBaseTest import BluetoothCarHfpBaseTest
+from acts.test_utils.bt import BtEnum
+from acts.test_utils.bt import bt_test_utils
+from acts.test_utils.car import car_telecom_utils
+from acts.test_utils.tel import tel_defines
+from acts.test_utils.tel.tel_test_utils import hangup_call
+from acts.test_utils.tel.tel_test_utils import initiate_call
+from acts.test_utils.tel.tel_test_utils import wait_and_answer_call
+from acts.test_utils.tel.tel_test_utils import wait_for_ringing_call
+from acts.test_utils.tel.tel_voice_utils import get_audio_route
+from acts.test_utils.tel.tel_voice_utils import set_audio_route
+from acts.test_utils.tel.tel_voice_utils import swap_calls
BLUETOOTH_PKG_NAME = "com.android.bluetooth"
CALL_TYPE_OUTGOING = "CALL_TYPE_OUTGOING"
diff --git a/acts_tests/tests/google/bt/car_bt/BtCarHfpConnectionTest.py b/acts_tests/tests/google/bt/car_bt/BtCarHfpConnectionTest.py
index bda7e88..006aa20 100644
--- a/acts_tests/tests/google/bt/car_bt/BtCarHfpConnectionTest.py
+++ b/acts_tests/tests/google/bt/car_bt/BtCarHfpConnectionTest.py
@@ -20,16 +20,16 @@
import time
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
-from acts_contrib.test_utils.bt.BluetoothCarHfpBaseTest import BluetoothCarHfpBaseTest
-from acts_contrib.test_utils.bt import BtEnum
-from acts_contrib.test_utils.bt import bt_test_utils
-from acts_contrib.test_utils.car import car_bt_utils
-from acts_contrib.test_utils.car import car_telecom_utils
-from acts_contrib.test_utils.tel import tel_defines
-from acts_contrib.test_utils.tel.tel_test_utils import hangup_call
-from acts_contrib.test_utils.tel.tel_test_utils import initiate_call
-from acts_contrib.test_utils.tel.tel_test_utils import wait_and_answer_call
+from acts.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
+from acts.test_utils.bt.BluetoothCarHfpBaseTest import BluetoothCarHfpBaseTest
+from acts.test_utils.bt import BtEnum
+from acts.test_utils.bt import bt_test_utils
+from acts.test_utils.car import car_bt_utils
+from acts.test_utils.car import car_telecom_utils
+from acts.test_utils.tel import tel_defines
+from acts.test_utils.tel.tel_test_utils import hangup_call
+from acts.test_utils.tel.tel_test_utils import initiate_call
+from acts.test_utils.tel.tel_test_utils import wait_and_answer_call
BLUETOOTH_PKG_NAME = "com.android.bluetooth"
CALL_TYPE_OUTGOING = "CALL_TYPE_OUTGOING"
diff --git a/acts_tests/tests/google/bt/car_bt/BtCarHfpFuzzTest.py b/acts_tests/tests/google/bt/car_bt/BtCarHfpFuzzTest.py
index a081901..ebb0d28 100644
--- a/acts_tests/tests/google/bt/car_bt/BtCarHfpFuzzTest.py
+++ b/acts_tests/tests/google/bt/car_bt/BtCarHfpFuzzTest.py
@@ -21,12 +21,12 @@
import time
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
-from acts_contrib.test_utils.bt.BluetoothCarHfpBaseTest import BluetoothCarHfpBaseTest
-from acts_contrib.test_utils.bt import BtEnum
-from acts_contrib.test_utils.bt import bt_test_utils
-from acts_contrib.test_utils.car import car_telecom_utils
-from acts_contrib.test_utils.tel import tel_defines
+from acts.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
+from acts.test_utils.bt.BluetoothCarHfpBaseTest import BluetoothCarHfpBaseTest
+from acts.test_utils.bt import BtEnum
+from acts.test_utils.bt import bt_test_utils
+from acts.test_utils.car import car_telecom_utils
+from acts.test_utils.tel import tel_defines
STABILIZATION_DELAY_SEC = 5
diff --git a/acts_tests/tests/google/bt/car_bt/BtCarHfpTest.py b/acts_tests/tests/google/bt/car_bt/BtCarHfpTest.py
index 2806feb..2fc6260 100644
--- a/acts_tests/tests/google/bt/car_bt/BtCarHfpTest.py
+++ b/acts_tests/tests/google/bt/car_bt/BtCarHfpTest.py
@@ -19,13 +19,13 @@
import time
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
-from acts_contrib.test_utils.bt.BluetoothCarHfpBaseTest import BluetoothCarHfpBaseTest
-from acts_contrib.test_utils.bt import BtEnum
-from acts_contrib.test_utils.bt import bt_test_utils
-from acts_contrib.test_utils.car import car_telecom_utils
-from acts_contrib.test_utils.car import tel_telecom_utils
-from acts_contrib.test_utils.tel import tel_defines
+from acts.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
+from acts.test_utils.bt.BluetoothCarHfpBaseTest import BluetoothCarHfpBaseTest
+from acts.test_utils.bt import BtEnum
+from acts.test_utils.bt import bt_test_utils
+from acts.test_utils.car import car_telecom_utils
+from acts.test_utils.car import tel_telecom_utils
+from acts.test_utils.tel import tel_defines
BLUETOOTH_PKG_NAME = "com.android.bluetooth"
CALL_TYPE_OUTGOING = "CALL_TYPE_OUTGOING"
diff --git a/acts_tests/tests/google/bt/car_bt/BtCarMapMceTest.py b/acts_tests/tests/google/bt/car_bt/BtCarMapMceTest.py
index b72ffbb..93dbab8 100644
--- a/acts_tests/tests/google/bt/car_bt/BtCarMapMceTest.py
+++ b/acts_tests/tests/google/bt/car_bt/BtCarMapMceTest.py
@@ -22,15 +22,15 @@
import acts
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
-from acts_contrib.test_utils.bt.BluetoothCarHfpBaseTest import BluetoothCarHfpBaseTest
-from acts_contrib.test_utils.bt import bt_test_utils
-from acts_contrib.test_utils.bt import BtEnum
-from acts_contrib.test_utils.tel.tel_defines import EventSmsReceived
-from acts_contrib.test_utils.tel.tel_defines import EventSmsSentSuccess
-from acts_contrib.test_utils.tel.tel_defines import EventSmsDeliverSuccess
-from acts_contrib.test_utils.tel.tel_test_utils import get_phone_number
-from acts_contrib.test_utils.tel.tel_test_utils import toggle_airplane_mode_by_adb
+from acts.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
+from acts.test_utils.bt.BluetoothCarHfpBaseTest import BluetoothCarHfpBaseTest
+from acts.test_utils.bt import bt_test_utils
+from acts.test_utils.bt import BtEnum
+from acts.test_utils.tel.tel_defines import EventSmsReceived
+from acts.test_utils.tel.tel_defines import EventSmsSentSuccess
+from acts.test_utils.tel.tel_defines import EventSmsDeliverSuccess
+from acts.test_utils.tel.tel_test_utils import get_phone_number
+from acts.test_utils.tel.tel_test_utils import toggle_airplane_mode_by_adb
EVENT_MAP_MESSAGE_RECEIVED = "MapMessageReceived"
TIMEOUT = 2000
diff --git a/acts_tests/tests/google/bt/car_bt/BtCarMediaConnectionTest.py b/acts_tests/tests/google/bt/car_bt/BtCarMediaConnectionTest.py
index 068b807..3f6e495 100644
--- a/acts_tests/tests/google/bt/car_bt/BtCarMediaConnectionTest.py
+++ b/acts_tests/tests/google/bt/car_bt/BtCarMediaConnectionTest.py
@@ -20,11 +20,11 @@
import time
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
-from acts_contrib.test_utils.bt import bt_test_utils
-from acts_contrib.test_utils.car import car_bt_utils
-from acts_contrib.test_utils.bt import BtEnum
-from acts_contrib.test_utils.bt.bt_test_utils import is_a2dp_connected
+from acts.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
+from acts.test_utils.bt import bt_test_utils
+from acts.test_utils.car import car_bt_utils
+from acts.test_utils.bt import BtEnum
+from acts.test_utils.bt.bt_test_utils import is_a2dp_connected
class BtCarMediaConnectionTest(BluetoothBaseTest):
diff --git a/acts_tests/tests/google/bt/car_bt/BtCarMediaPassthroughTest.py b/acts_tests/tests/google/bt/car_bt/BtCarMediaPassthroughTest.py
index 1db9a11..dbb1cc9 100644
--- a/acts_tests/tests/google/bt/car_bt/BtCarMediaPassthroughTest.py
+++ b/acts_tests/tests/google/bt/car_bt/BtCarMediaPassthroughTest.py
@@ -21,11 +21,11 @@
import time
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
-from acts_contrib.test_utils.bt import bt_test_utils
-from acts_contrib.test_utils.bt import BtEnum
-from acts_contrib.test_utils.car import car_media_utils
-from acts_contrib.test_utils.bt.bt_test_utils import is_a2dp_connected
+from acts.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
+from acts.test_utils.bt import bt_test_utils
+from acts.test_utils.bt import BtEnum
+from acts.test_utils.car import car_media_utils
+from acts.test_utils.bt.bt_test_utils import is_a2dp_connected
from acts.keys import Config
diff --git a/acts_tests/tests/google/bt/car_bt/BtCarMultiUserTest.py b/acts_tests/tests/google/bt/car_bt/BtCarMultiUserTest.py
index 6ec1320..3cde80f 100644
--- a/acts_tests/tests/google/bt/car_bt/BtCarMultiUserTest.py
+++ b/acts_tests/tests/google/bt/car_bt/BtCarMultiUserTest.py
@@ -18,9 +18,9 @@
"""
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
-from acts_contrib.test_utils.bt import bt_test_utils
-from acts_contrib.test_utils.users import users
+from acts.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
+from acts.test_utils.bt import bt_test_utils
+from acts.test_utils.users import users
import time
import random
import re
diff --git a/acts_tests/tests/google/bt/car_bt/BtCarPairedConnectDisconnectTest.py b/acts_tests/tests/google/bt/car_bt/BtCarPairedConnectDisconnectTest.py
index eb2a06c..705b4ec 100644
--- a/acts_tests/tests/google/bt/car_bt/BtCarPairedConnectDisconnectTest.py
+++ b/acts_tests/tests/google/bt/car_bt/BtCarPairedConnectDisconnectTest.py
@@ -28,10 +28,10 @@
import time
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
+from acts.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
from acts.base_test import BaseTestClass
-from acts_contrib.test_utils.bt import bt_test_utils
-from acts_contrib.test_utils.bt import BtEnum
+from acts.test_utils.bt import bt_test_utils
+from acts.test_utils.bt import BtEnum
from acts import asserts
diff --git a/acts_tests/tests/google/bt/car_bt/BtCarPairingTest.py b/acts_tests/tests/google/bt/car_bt/BtCarPairingTest.py
index 135c450..603f1a8 100644
--- a/acts_tests/tests/google/bt/car_bt/BtCarPairingTest.py
+++ b/acts_tests/tests/google/bt/car_bt/BtCarPairingTest.py
@@ -20,11 +20,11 @@
import time
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
+from acts.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
from acts.base_test import BaseTestClass
-from acts_contrib.test_utils.bt import bt_test_utils
-from acts_contrib.test_utils.car import car_bt_utils
-from acts_contrib.test_utils.bt import BtEnum
+from acts.test_utils.bt import bt_test_utils
+from acts.test_utils.car import car_bt_utils
+from acts.test_utils.bt import BtEnum
# Timed wait between Bonding happens and Android actually gets the list of
# supported services (and subsequently updates the priorities)
diff --git a/acts_tests/tests/google/bt/car_bt/BtCarPbapTest.py b/acts_tests/tests/google/bt/car_bt/BtCarPbapTest.py
index a4d241f..6d5bccb 100644
--- a/acts_tests/tests/google/bt/car_bt/BtCarPbapTest.py
+++ b/acts_tests/tests/google/bt/car_bt/BtCarPbapTest.py
@@ -20,14 +20,14 @@
import time
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
-from acts_contrib.test_utils.bt.bt_test_utils import setup_multiple_devices_for_bt_test
+from acts.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
+from acts.test_utils.bt.bt_test_utils import setup_multiple_devices_for_bt_test
from acts.base_test import BaseTestClass
-from acts_contrib.test_utils.bt import bt_contacts_utils
-from acts_contrib.test_utils.bt import bt_test_utils
-from acts_contrib.test_utils.car import car_bt_utils
+from acts.test_utils.bt import bt_contacts_utils
+from acts.test_utils.bt import bt_test_utils
+from acts.test_utils.car import car_bt_utils
from acts.utils import exe_cmd
-import acts_contrib.test_utils.bt.BtEnum as BtEnum
+import acts.test_utils.bt.BtEnum as BtEnum
# Offset call logs by 1 minute
CALL_LOG_TIME_OFFSET_IN_MSEC = 60000
diff --git a/acts_tests/tests/google/bt/car_bt/BtCarToggleTest.py b/acts_tests/tests/google/bt/car_bt/BtCarToggleTest.py
index 27d08e8..aa7f5b4 100644
--- a/acts_tests/tests/google/bt/car_bt/BtCarToggleTest.py
+++ b/acts_tests/tests/google/bt/car_bt/BtCarToggleTest.py
@@ -18,8 +18,8 @@
"""
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
-from acts_contrib.test_utils.bt import bt_test_utils
+from acts.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
+from acts.test_utils.bt import bt_test_utils
import random
import time
diff --git a/acts_tests/tests/google/bt/gatt/GattOverBrEdrTest.py b/acts_tests/tests/google/bt/gatt/GattOverBrEdrTest.py
index 0d0ac0c..7985540 100644
--- a/acts_tests/tests/google/bt/gatt/GattOverBrEdrTest.py
+++ b/acts_tests/tests/google/bt/gatt/GattOverBrEdrTest.py
@@ -21,22 +21,22 @@
from queue import Empty
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
-from acts_contrib.test_utils.bt.bt_test_utils import reset_bluetooth
-from acts_contrib.test_utils.bt.bt_constants import gatt_characteristic
-from acts_contrib.test_utils.bt.bt_constants import gatt_service_types
-from acts_contrib.test_utils.bt.bt_constants import gatt_transport
-from acts_contrib.test_utils.bt.bt_constants import gatt_cb_strings
-from acts_contrib.test_utils.bt.bt_gatt_utils import GattTestUtilsError
-from acts_contrib.test_utils.bt.bt_gatt_utils import disconnect_gatt_connection
-from acts_contrib.test_utils.bt.bt_gatt_utils import log_gatt_server_uuids
-from acts_contrib.test_utils.bt.bt_gatt_utils import orchestrate_gatt_connection
-from acts_contrib.test_utils.bt.bt_gatt_utils import setup_gatt_characteristics
-from acts_contrib.test_utils.bt.bt_gatt_utils import setup_gatt_connection
-from acts_contrib.test_utils.bt.bt_gatt_utils import setup_gatt_descriptors
-from acts_contrib.test_utils.bt.bt_gatt_utils import setup_multiple_services
-from acts_contrib.test_utils.bt.bt_test_utils import setup_multiple_devices_for_bt_test
-from acts_contrib.test_utils.bt.bt_test_utils import take_btsnoop_logs
+from acts.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
+from acts.test_utils.bt.bt_test_utils import reset_bluetooth
+from acts.test_utils.bt.bt_constants import gatt_characteristic
+from acts.test_utils.bt.bt_constants import gatt_service_types
+from acts.test_utils.bt.bt_constants import gatt_transport
+from acts.test_utils.bt.bt_constants import gatt_cb_strings
+from acts.test_utils.bt.bt_gatt_utils import GattTestUtilsError
+from acts.test_utils.bt.bt_gatt_utils import disconnect_gatt_connection
+from acts.test_utils.bt.bt_gatt_utils import log_gatt_server_uuids
+from acts.test_utils.bt.bt_gatt_utils import orchestrate_gatt_connection
+from acts.test_utils.bt.bt_gatt_utils import setup_gatt_characteristics
+from acts.test_utils.bt.bt_gatt_utils import setup_gatt_connection
+from acts.test_utils.bt.bt_gatt_utils import setup_gatt_descriptors
+from acts.test_utils.bt.bt_gatt_utils import setup_multiple_services
+from acts.test_utils.bt.bt_test_utils import setup_multiple_devices_for_bt_test
+from acts.test_utils.bt.bt_test_utils import take_btsnoop_logs
class GattOverBrEdrTest(BluetoothBaseTest):
diff --git a/acts_tests/tests/google/bt/headphone_automation/HeadphoneTest.py b/acts_tests/tests/google/bt/headphone_automation/HeadphoneTest.py
index 9d04088..43934a1 100644
--- a/acts_tests/tests/google/bt/headphone_automation/HeadphoneTest.py
+++ b/acts_tests/tests/google/bt/headphone_automation/HeadphoneTest.py
@@ -30,12 +30,12 @@
from acts.asserts import assert_true
from acts.keys import Config
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.bt.bt_constants import ble_scan_settings_modes
-from acts_contrib.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
-from acts_contrib.test_utils.bt.bt_test_utils import bluetooth_enabled_check
-from acts_contrib.test_utils.bt.bt_test_utils import clear_bonded_devices
-from acts_contrib.test_utils.bt.bt_test_utils import disable_bluetooth
-from acts_contrib.test_utils.bt.bt_test_utils import reset_bluetooth
+from acts.test_utils.bt.bt_constants import ble_scan_settings_modes
+from acts.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
+from acts.test_utils.bt.bt_test_utils import bluetooth_enabled_check
+from acts.test_utils.bt.bt_test_utils import clear_bonded_devices
+from acts.test_utils.bt.bt_test_utils import disable_bluetooth
+from acts.test_utils.bt.bt_test_utils import reset_bluetooth
from acts.controllers.relay_lib.sony_xb2_speaker import SonyXB2Speaker
diff --git a/acts_tests/tests/google/bt/headphone_automation/SineWaveQualityTest.py b/acts_tests/tests/google/bt/headphone_automation/SineWaveQualityTest.py
index 5688afc..b7fef62 100644
--- a/acts_tests/tests/google/bt/headphone_automation/SineWaveQualityTest.py
+++ b/acts_tests/tests/google/bt/headphone_automation/SineWaveQualityTest.py
@@ -1,7 +1,7 @@
from acts import asserts
from acts.signals import TestPass
-from acts_contrib.test_utils.audio_analysis_lib import audio_analysis
-from acts_contrib.test_utils.bt.A2dpBaseTest import A2dpBaseTest
+from acts.test_utils.audio_analysis_lib import audio_analysis
+from acts.test_utils.bt.A2dpBaseTest import A2dpBaseTest
class SineWaveQualityTest(A2dpBaseTest):
diff --git a/acts_tests/tests/google/bt/hid/HidDeviceTest.py b/acts_tests/tests/google/bt/hid/HidDeviceTest.py
index 0466376..e7e1778 100644
--- a/acts_tests/tests/google/bt/hid/HidDeviceTest.py
+++ b/acts_tests/tests/google/bt/hid/HidDeviceTest.py
@@ -19,14 +19,14 @@
from acts.base_test import BaseTestClass
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
-from acts_contrib.test_utils.bt.bt_test_utils import setup_multiple_devices_for_bt_test
-from acts_contrib.test_utils.bt.bt_test_utils import clear_bonded_devices
-from acts_contrib.test_utils.bt.bt_test_utils import pair_pri_to_sec
-from acts_contrib.test_utils.bt.bt_test_utils import hid_keyboard_report
-from acts_contrib.test_utils.bt.bt_test_utils import hid_device_send_key_data_report
-from acts_contrib.test_utils.bt.bt_constants import hid_connection_timeout
-from acts_contrib.test_utils.bt import bt_constants
+from acts.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
+from acts.test_utils.bt.bt_test_utils import setup_multiple_devices_for_bt_test
+from acts.test_utils.bt.bt_test_utils import clear_bonded_devices
+from acts.test_utils.bt.bt_test_utils import pair_pri_to_sec
+from acts.test_utils.bt.bt_test_utils import hid_keyboard_report
+from acts.test_utils.bt.bt_test_utils import hid_device_send_key_data_report
+from acts.test_utils.bt.bt_constants import hid_connection_timeout
+from acts.test_utils.bt import bt_constants
import time
diff --git a/acts_tests/tests/google/bt/ota/BtOtaTest.py b/acts_tests/tests/google/bt/ota/BtOtaTest.py
index 2c8411d..86e3098 100644
--- a/acts_tests/tests/google/bt/ota/BtOtaTest.py
+++ b/acts_tests/tests/google/bt/ota/BtOtaTest.py
@@ -15,8 +15,8 @@
from acts.libs.ota import ota_updater
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
-from acts_contrib.test_utils.bt.bt_test_utils import pair_pri_to_sec
+from acts.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
+from acts.test_utils.bt.bt_test_utils import pair_pri_to_sec
from acts import signals
diff --git a/acts_tests/tests/google/bt/pan/BtPanTest.py b/acts_tests/tests/google/bt/pan/BtPanTest.py
index 75d14b2..01f6078 100644
--- a/acts_tests/tests/google/bt/pan/BtPanTest.py
+++ b/acts_tests/tests/google/bt/pan/BtPanTest.py
@@ -23,10 +23,10 @@
This device was not intended to run in a sheild box.
"""
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
-from acts_contrib.test_utils.bt.bt_test_utils import bluetooth_enabled_check
-from acts_contrib.test_utils.bt.bt_test_utils import orchestrate_and_verify_pan_connection
-from acts_contrib.test_utils.tel.tel_test_utils import verify_http_connection
+from acts.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
+from acts.test_utils.bt.bt_test_utils import bluetooth_enabled_check
+from acts.test_utils.bt.bt_test_utils import orchestrate_and_verify_pan_connection
+from acts.test_utils.tel.tel_test_utils import verify_http_connection
from queue import Empty
import time
diff --git a/acts_tests/tests/google/bt/performance/BtA2dpOtaRangeTest.py b/acts_tests/tests/google/bt/performance/BtA2dpOtaRangeTest.py
index e794b1b..e0a7962 100755
--- a/acts_tests/tests/google/bt/performance/BtA2dpOtaRangeTest.py
+++ b/acts_tests/tests/google/bt/performance/BtA2dpOtaRangeTest.py
@@ -9,13 +9,13 @@
import os
import pyvisa
import time
-import acts_contrib.test_utils.coex.audio_test_utils as atu
-import acts_contrib.test_utils.bt.bt_test_utils as btutils
+import acts.test_utils.coex.audio_test_utils as atu
+import acts.test_utils.bt.bt_test_utils as btutils
import pandas as pd
from acts import asserts
-from acts_contrib.test_utils.abstract_devices.bluetooth_handsfree_abstract_device import BluetoothHandsfreeAbstractDeviceFactory as bt_factory
-from acts_contrib.test_utils.bt.A2dpBaseTest import A2dpBaseTest
-from acts_contrib.test_utils.power.PowerBTBaseTest import ramp_attenuation
+from acts.test_utils.abstract_devices.bluetooth_handsfree_abstract_device import BluetoothHandsfreeAbstractDeviceFactory as bt_factory
+from acts.test_utils.bt.A2dpBaseTest import A2dpBaseTest
+from acts.test_utils.power.PowerBTBaseTest import ramp_attenuation
PHONE_MUSIC_FILE_DIRECTORY = '/sdcard/Music'
diff --git a/acts_tests/tests/google/bt/performance/BtA2dpRangeTest.py b/acts_tests/tests/google/bt/performance/BtA2dpRangeTest.py
index d616230..55b0751 100644
--- a/acts_tests/tests/google/bt/performance/BtA2dpRangeTest.py
+++ b/acts_tests/tests/google/bt/performance/BtA2dpRangeTest.py
@@ -14,14 +14,14 @@
# License for the specific language governing permissions and limitations under
# the License.
-import acts_contrib.test_utils.bt.bt_test_utils as btutils
+import acts.test_utils.bt.bt_test_utils as btutils
from acts import asserts
from acts.signals import TestPass
-from acts_contrib.test_utils.bt import bt_constants
-from acts_contrib.test_utils.bt import BtEnum
-from acts_contrib.test_utils.bt.A2dpBaseTest import A2dpBaseTest
-from acts_contrib.test_utils.bt.loggers import bluetooth_metric_logger as log
-from acts_contrib.test_utils.power.PowerBTBaseTest import ramp_attenuation
+from acts.test_utils.bt import bt_constants
+from acts.test_utils.bt import BtEnum
+from acts.test_utils.bt.A2dpBaseTest import A2dpBaseTest
+from acts.test_utils.bt.loggers import bluetooth_metric_logger as log
+from acts.test_utils.power.PowerBTBaseTest import ramp_attenuation
class BtA2dpRangeTest(A2dpBaseTest):
diff --git a/acts_tests/tests/google/bt/performance/BtCodecSweepTest.py b/acts_tests/tests/google/bt/performance/BtCodecSweepTest.py
index e9cc90f..7770852 100644
--- a/acts_tests/tests/google/bt/performance/BtCodecSweepTest.py
+++ b/acts_tests/tests/google/bt/performance/BtCodecSweepTest.py
@@ -18,9 +18,9 @@
from acts import asserts
from acts.signals import TestPass
-from acts_contrib.test_utils.bt.A2dpBaseTest import A2dpBaseTest
-from acts_contrib.test_utils.bt import bt_constants
-from acts_contrib.test_utils.bt.loggers.bluetooth_metric_logger import BluetoothMetricLogger
+from acts.test_utils.bt.A2dpBaseTest import A2dpBaseTest
+from acts.test_utils.bt import bt_constants
+from acts.test_utils.bt.loggers.bluetooth_metric_logger import BluetoothMetricLogger
DEFAULT_THDN_THRESHOLD = .1
DEFAULT_ANOMALIES_THRESHOLD = 0
diff --git a/acts_tests/tests/google/bt/performance/BtInterferenceDynamicTest.py b/acts_tests/tests/google/bt/performance/BtInterferenceDynamicTest.py
index 59721ca..664121d 100644
--- a/acts_tests/tests/google/bt/performance/BtInterferenceDynamicTest.py
+++ b/acts_tests/tests/google/bt/performance/BtInterferenceDynamicTest.py
@@ -19,9 +19,9 @@
import random
import time
from acts.signals import TestFailure
-from acts_contrib.test_utils.bt.BtInterferenceBaseTest import BtInterferenceBaseTest
-from acts_contrib.test_utils.bt.BtInterferenceBaseTest import get_iperf_results
-from acts_contrib.test_utils.power.PowerBTBaseTest import ramp_attenuation
+from acts.test_utils.bt.BtInterferenceBaseTest import BtInterferenceBaseTest
+from acts.test_utils.bt.BtInterferenceBaseTest import get_iperf_results
+from acts.test_utils.power.PowerBTBaseTest import ramp_attenuation
from multiprocessing import Process, Queue
DEFAULT_THDN_THRESHOLD = 0.9
diff --git a/acts_tests/tests/google/bt/performance/BtInterferenceRSSITest.py b/acts_tests/tests/google/bt/performance/BtInterferenceRSSITest.py
index 4f75031..a1c40f7 100644
--- a/acts_tests/tests/google/bt/performance/BtInterferenceRSSITest.py
+++ b/acts_tests/tests/google/bt/performance/BtInterferenceRSSITest.py
@@ -1,7 +1,7 @@
from multiprocessing import Process
import time
-from acts_contrib.test_utils.bt.A2dpBaseTest import A2dpBaseTest
+from acts.test_utils.bt.A2dpBaseTest import A2dpBaseTest
END_TOKEN = "end"
diff --git a/acts_tests/tests/google/bt/performance/BtInterferenceStaticTest.py b/acts_tests/tests/google/bt/performance/BtInterferenceStaticTest.py
index bf6b0de..84ca6d4 100644
--- a/acts_tests/tests/google/bt/performance/BtInterferenceStaticTest.py
+++ b/acts_tests/tests/google/bt/performance/BtInterferenceStaticTest.py
@@ -16,9 +16,9 @@
"""Stream music through connected device from phone across different
attenuations."""
from acts.signals import TestPass
-from acts_contrib.test_utils.bt.BtInterferenceBaseTest import BtInterferenceBaseTest
+from acts.test_utils.bt.BtInterferenceBaseTest import BtInterferenceBaseTest
from acts.metrics.loggers.blackbox import BlackboxMetricLogger
-from acts_contrib.test_utils.bt.BtInterferenceBaseTest import get_iperf_results
+from acts.test_utils.bt.BtInterferenceBaseTest import get_iperf_results
from multiprocessing import Process, Queue
DEFAULT_THDN_THRESHOLD = 0.9
diff --git a/acts_tests/tests/google/bt/pts/A2dpPtsTest.py b/acts_tests/tests/google/bt/pts/A2dpPtsTest.py
index 84b7b1b..2c2ffee 100644
--- a/acts_tests/tests/google/bt/pts/A2dpPtsTest.py
+++ b/acts_tests/tests/google/bt/pts/A2dpPtsTest.py
@@ -16,12 +16,12 @@
"""
A2DP PTS Tests.
"""
-from acts_contrib.test_utils.abstract_devices.bluetooth_device import AndroidBluetoothDevice
-from acts_contrib.test_utils.abstract_devices.bluetooth_device import FuchsiaBluetoothDevice
-from acts_contrib.test_utils.bt.pts.pts_base_class import PtsBaseClass
+from acts.test_utils.abstract_devices.bluetooth_device import AndroidBluetoothDevice
+from acts.test_utils.abstract_devices.bluetooth_device import FuchsiaBluetoothDevice
+from acts.test_utils.bt.pts.pts_base_class import PtsBaseClass
-import acts_contrib.test_utils.bt.pts.fuchsia_pts_ics_lib as f_ics_lib
-import acts_contrib.test_utils.bt.pts.fuchsia_pts_ixit_lib as f_ixit_lib
+import acts.test_utils.bt.pts.fuchsia_pts_ics_lib as f_ics_lib
+import acts.test_utils.bt.pts.fuchsia_pts_ixit_lib as f_ixit_lib
class A2dpPtsTest(PtsBaseClass):
diff --git a/acts_tests/tests/google/bt/pts/BtCmdLineTest.py b/acts_tests/tests/google/bt/pts/BtCmdLineTest.py
index 16e1aa0..8d925ed 100644
--- a/acts_tests/tests/google/bt/pts/BtCmdLineTest.py
+++ b/acts_tests/tests/google/bt/pts/BtCmdLineTest.py
@@ -21,14 +21,14 @@
Optional config parameters:
'sim_conf_file' : '/path_to_config/'
"""
-from acts_contrib.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
+from acts.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
from cmd_input import CmdInput
from queue import Empty
import os
import uuid
-from acts_contrib.test_utils.tel.tel_test_utils import setup_droid_properties
+from acts.test_utils.tel.tel_test_utils import setup_droid_properties
class BtCmdLineTest(BluetoothBaseTest):
diff --git a/acts_tests/tests/google/bt/pts/GattPtsTest.py b/acts_tests/tests/google/bt/pts/GattPtsTest.py
index d910233..4166f8e 100644
--- a/acts_tests/tests/google/bt/pts/GattPtsTest.py
+++ b/acts_tests/tests/google/bt/pts/GattPtsTest.py
@@ -18,14 +18,14 @@
"""
from acts import signals
-from acts_contrib.test_utils.abstract_devices.bluetooth_device import AndroidBluetoothDevice
-from acts_contrib.test_utils.abstract_devices.bluetooth_device import FuchsiaBluetoothDevice
+from acts.test_utils.abstract_devices.bluetooth_device import AndroidBluetoothDevice
+from acts.test_utils.abstract_devices.bluetooth_device import FuchsiaBluetoothDevice
from acts.controllers.bluetooth_pts_device import VERDICT_STRINGS
-from acts_contrib.test_utils.bt.pts.pts_base_class import PtsBaseClass
+from acts.test_utils.bt.pts.pts_base_class import PtsBaseClass
-import acts_contrib.test_utils.bt.gatt_test_database as gatt_test_database
-import acts_contrib.test_utils.bt.pts.fuchsia_pts_ics_lib as f_ics_lib
-import acts_contrib.test_utils.bt.pts.fuchsia_pts_ixit_lib as f_ixit_lib
+import acts.test_utils.bt.gatt_test_database as gatt_test_database
+import acts.test_utils.bt.pts.fuchsia_pts_ics_lib as f_ics_lib
+import acts.test_utils.bt.pts.fuchsia_pts_ixit_lib as f_ixit_lib
class GattPtsTest(PtsBaseClass):
diff --git a/acts_tests/tests/google/bt/pts/SdpPtsTest.py b/acts_tests/tests/google/bt/pts/SdpPtsTest.py
index 25642b8..1dd5d66 100644
--- a/acts_tests/tests/google/bt/pts/SdpPtsTest.py
+++ b/acts_tests/tests/google/bt/pts/SdpPtsTest.py
@@ -16,14 +16,14 @@
"""
SDP PTS Tests.
"""
-from acts_contrib.test_utils.abstract_devices.bluetooth_device import AndroidBluetoothDevice
-from acts_contrib.test_utils.abstract_devices.bluetooth_device import FuchsiaBluetoothDevice
-from acts_contrib.test_utils.bt.bt_constants import bt_attribute_values
-from acts_contrib.test_utils.bt.bt_constants import sig_uuid_constants
-from acts_contrib.test_utils.bt.pts.pts_base_class import PtsBaseClass
+from acts.test_utils.abstract_devices.bluetooth_device import AndroidBluetoothDevice
+from acts.test_utils.abstract_devices.bluetooth_device import FuchsiaBluetoothDevice
+from acts.test_utils.bt.bt_constants import bt_attribute_values
+from acts.test_utils.bt.bt_constants import sig_uuid_constants
+from acts.test_utils.bt.pts.pts_base_class import PtsBaseClass
-import acts_contrib.test_utils.bt.pts.fuchsia_pts_ics_lib as f_ics_lib
-import acts_contrib.test_utils.bt.pts.fuchsia_pts_ixit_lib as f_ixit_lib
+import acts.test_utils.bt.pts.fuchsia_pts_ics_lib as f_ics_lib
+import acts.test_utils.bt.pts.fuchsia_pts_ixit_lib as f_ixit_lib
# SDP_RECORD Definition is WIP
SDP_RECORD = {
diff --git a/acts_tests/tests/google/bt/pts/cmd_input.py b/acts_tests/tests/google/bt/pts/cmd_input.py
index 2db77a7..4037efc 100644
--- a/acts_tests/tests/google/bt/pts/cmd_input.py
+++ b/acts_tests/tests/google/bt/pts/cmd_input.py
@@ -16,10 +16,10 @@
"""
Python script for wrappers to various libraries.
"""
-from acts_contrib.test_utils.bt.bt_constants import bt_scan_mode_types
-from acts_contrib.test_utils.bt.bt_constants import gatt_server_responses
-import acts_contrib.test_utils.bt.gatt_test_database as gatt_test_database
-from acts_contrib.test_utils.bt.bt_carkit_lib import E2eBtCarkitLib
+from acts.test_utils.bt.bt_constants import bt_scan_mode_types
+from acts.test_utils.bt.bt_constants import gatt_server_responses
+import acts.test_utils.bt.gatt_test_database as gatt_test_database
+from acts.test_utils.bt.bt_carkit_lib import E2eBtCarkitLib
import threading
import time
diff --git a/acts_tests/tests/google/bt/sar/BleSarPowerLimitTest.py b/acts_tests/tests/google/bt/sar/BleSarPowerLimitTest.py
index cf9ea2b..490cb30 100644
--- a/acts_tests/tests/google/bt/sar/BleSarPowerLimitTest.py
+++ b/acts_tests/tests/google/bt/sar/BleSarPowerLimitTest.py
@@ -18,13 +18,13 @@
import time
from acts import utils
-import acts_contrib.test_utils.bt.bt_test_utils as bt_utils
-import acts_contrib.test_utils.wifi.wifi_performance_test_utils as wifi_utils
-from acts_contrib.test_utils.bt.ble_performance_test_utils import ble_gatt_disconnection
-from acts_contrib.test_utils.bt.ble_performance_test_utils import ble_coc_connection
-from acts_contrib.test_utils.bt.bt_constants import l2cap_max_inactivity_delay_after_disconnect
-from acts_contrib.test_utils.bt.bt_test_utils import setup_multiple_devices_for_bt_test
-from acts_contrib.test_utils.bt.BtSarBaseTest import BtSarBaseTest
+import acts.test_utils.bt.bt_test_utils as bt_utils
+import acts.test_utils.wifi.wifi_performance_test_utils as wifi_utils
+from acts.test_utils.bt.ble_performance_test_utils import ble_gatt_disconnection
+from acts.test_utils.bt.ble_performance_test_utils import ble_coc_connection
+from acts.test_utils.bt.bt_constants import l2cap_max_inactivity_delay_after_disconnect
+from acts.test_utils.bt.bt_test_utils import setup_multiple_devices_for_bt_test
+from acts.test_utils.bt.BtSarBaseTest import BtSarBaseTest
FIXED_ATTENUATION = 36
diff --git a/acts_tests/tests/google/bt/sar/BtSarPowerLimitTest.py b/acts_tests/tests/google/bt/sar/BtSarPowerLimitTest.py
index 5b75606..74a1000 100644
--- a/acts_tests/tests/google/bt/sar/BtSarPowerLimitTest.py
+++ b/acts_tests/tests/google/bt/sar/BtSarPowerLimitTest.py
@@ -16,10 +16,10 @@
import os
import time
-import acts_contrib.test_utils.bt.bt_test_utils as bt_utils
-from acts_contrib.test_utils.bt.BtSarBaseTest import BtSarBaseTest
-from acts_contrib.test_utils.power.PowerBTBaseTest import ramp_attenuation
-import acts_contrib.test_utils.wifi.wifi_performance_test_utils as wifi_utils
+import acts.test_utils.bt.bt_test_utils as bt_utils
+from acts.test_utils.bt.BtSarBaseTest import BtSarBaseTest
+from acts.test_utils.power.PowerBTBaseTest import ramp_attenuation
+import acts.test_utils.wifi.wifi_performance_test_utils as wifi_utils
SLEEP_DURATION = 2
diff --git a/acts_tests/tests/google/bt/sar/BtSarSanityTest.py b/acts_tests/tests/google/bt/sar/BtSarSanityTest.py
index 08a4369..7ef8840 100644
--- a/acts_tests/tests/google/bt/sar/BtSarSanityTest.py
+++ b/acts_tests/tests/google/bt/sar/BtSarSanityTest.py
@@ -19,8 +19,8 @@
import time
from acts import asserts
-import acts_contrib.test_utils.bt.bt_test_utils as bt_utils
-from acts_contrib.test_utils.bt.BtSarBaseTest import BtSarBaseTest
+import acts.test_utils.bt.bt_test_utils as bt_utils
+from acts.test_utils.bt.BtSarBaseTest import BtSarBaseTest
class BtSarSanityTest(BtSarBaseTest):
diff --git a/acts_tests/tests/google/bt/sar/BtSarTpcTest.py b/acts_tests/tests/google/bt/sar/BtSarTpcTest.py
index 770ebf3..cf29d68 100644
--- a/acts_tests/tests/google/bt/sar/BtSarTpcTest.py
+++ b/acts_tests/tests/google/bt/sar/BtSarTpcTest.py
@@ -17,13 +17,13 @@
import os
import time
import numpy as np
-import acts_contrib.test_utils.bt.bt_test_utils as bt_utils
+import acts.test_utils.bt.bt_test_utils as bt_utils
from acts.metrics.loggers.blackbox import BlackboxMetricLogger
-import acts_contrib.test_utils.wifi.wifi_performance_test_utils as wifi_utils
+import acts.test_utils.wifi.wifi_performance_test_utils as wifi_utils
from acts import asserts
from functools import partial
-from acts_contrib.test_utils.bt.BtSarBaseTest import BtSarBaseTest
+from acts.test_utils.bt.BtSarBaseTest import BtSarBaseTest
class BtSarTpcTest(BtSarBaseTest):
diff --git a/acts_tests/tests/google/bt/sdp/SdpSetupTest.py b/acts_tests/tests/google/bt/sdp/SdpSetupTest.py
index 6a9409a..0725825 100644
--- a/acts_tests/tests/google/bt/sdp/SdpSetupTest.py
+++ b/acts_tests/tests/google/bt/sdp/SdpSetupTest.py
@@ -22,12 +22,12 @@
"""
from acts import signals
from acts.base_test import BaseTestClass
-from acts_contrib.test_utils.abstract_devices.bluetooth_device import AndroidBluetoothDevice
-from acts_contrib.test_utils.abstract_devices.bluetooth_device import FuchsiaBluetoothDevice
-from acts_contrib.test_utils.abstract_devices.bluetooth_device import create_bluetooth_device
-from acts_contrib.test_utils.bt.bt_constants import bt_attribute_values
-from acts_contrib.test_utils.bt.bt_constants import sig_uuid_constants
-from acts_contrib.test_utils.fuchsia.sdp_records import sdp_pts_record_list
+from acts.test_utils.abstract_devices.bluetooth_device import AndroidBluetoothDevice
+from acts.test_utils.abstract_devices.bluetooth_device import FuchsiaBluetoothDevice
+from acts.test_utils.abstract_devices.bluetooth_device import create_bluetooth_device
+from acts.test_utils.bt.bt_constants import bt_attribute_values
+from acts.test_utils.bt.bt_constants import sig_uuid_constants
+from acts.test_utils.fuchsia.sdp_records import sdp_pts_record_list
class SdpSetupTest(BaseTestClass):
diff --git a/acts_tests/tests/google/bt/system_tests/BtStressTest.py b/acts_tests/tests/google/bt/system_tests/BtStressTest.py
index 107fdac..0473aa0 100644
--- a/acts_tests/tests/google/bt/system_tests/BtStressTest.py
+++ b/acts_tests/tests/google/bt/system_tests/BtStressTest.py
@@ -20,13 +20,13 @@
import time
from acts.base_test import BaseTestClass
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
-from acts_contrib.test_utils.bt.bt_constants import bluetooth_off
-from acts_contrib.test_utils.bt.bt_constants import bluetooth_on
-from acts_contrib.test_utils.bt.bt_test_utils import clear_bonded_devices
-from acts_contrib.test_utils.bt.bt_test_utils import pair_pri_to_sec
-from acts_contrib.test_utils.bt.bt_test_utils import reset_bluetooth
-from acts_contrib.test_utils.bt.bt_test_utils import setup_multiple_devices_for_bt_test
+from acts.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
+from acts.test_utils.bt.bt_constants import bluetooth_off
+from acts.test_utils.bt.bt_constants import bluetooth_on
+from acts.test_utils.bt.bt_test_utils import clear_bonded_devices
+from acts.test_utils.bt.bt_test_utils import pair_pri_to_sec
+from acts.test_utils.bt.bt_test_utils import reset_bluetooth
+from acts.test_utils.bt.bt_test_utils import setup_multiple_devices_for_bt_test
class BtStressTest(BluetoothBaseTest):
diff --git a/acts_tests/tests/google/bt/system_tests/RfcommLongevityTest.py b/acts_tests/tests/google/bt/system_tests/RfcommLongevityTest.py
index 356ac8d..d1d4fe5 100644
--- a/acts_tests/tests/google/bt/system_tests/RfcommLongevityTest.py
+++ b/acts_tests/tests/google/bt/system_tests/RfcommLongevityTest.py
@@ -23,10 +23,10 @@
from queue import Empty
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
-from acts_contrib.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
-from acts_contrib.test_utils.bt.bt_test_utils import orchestrate_rfcomm_connection
-from acts_contrib.test_utils.bt.bt_test_utils import write_read_verify_data
+from acts.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
+from acts.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
+from acts.test_utils.bt.bt_test_utils import orchestrate_rfcomm_connection
+from acts.test_utils.bt.bt_test_utils import write_read_verify_data
class RfcommLongevityTest(BluetoothBaseTest):
diff --git a/acts_tests/tests/google/bt/system_tests/RfcommStressTest.py b/acts_tests/tests/google/bt/system_tests/RfcommStressTest.py
index ea9d999..3fac543 100644
--- a/acts_tests/tests/google/bt/system_tests/RfcommStressTest.py
+++ b/acts_tests/tests/google/bt/system_tests/RfcommStressTest.py
@@ -23,10 +23,10 @@
from queue import Empty
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
-from acts_contrib.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
-from acts_contrib.test_utils.bt.bt_test_utils import orchestrate_rfcomm_connection
-from acts_contrib.test_utils.bt.bt_test_utils import write_read_verify_data
+from acts.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
+from acts.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
+from acts.test_utils.bt.bt_test_utils import orchestrate_rfcomm_connection
+from acts.test_utils.bt.bt_test_utils import write_read_verify_data
class RfcommStressTest(BluetoothBaseTest):
diff --git a/acts_tests/tests/google/bt/test_tools/BtReconnectTest.py b/acts_tests/tests/google/bt/test_tools/BtReconnectTest.py
index a2f7f98..a56264b 100644
--- a/acts_tests/tests/google/bt/test_tools/BtReconnectTest.py
+++ b/acts_tests/tests/google/bt/test_tools/BtReconnectTest.py
@@ -16,8 +16,8 @@
import time
-from acts_contrib.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
-from acts_contrib.test_utils.bt.bt_test_utils import *
+from acts.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
+from acts.test_utils.bt.bt_test_utils import *
class BtReconnectTest(BluetoothBaseTest):
diff --git a/acts_tests/tests/google/bt/test_tools/EnergyTest.py b/acts_tests/tests/google/bt/test_tools/EnergyTest.py
index 7797f8a..a9afc86 100644
--- a/acts_tests/tests/google/bt/test_tools/EnergyTest.py
+++ b/acts_tests/tests/google/bt/test_tools/EnergyTest.py
@@ -18,7 +18,7 @@
"""
from queue import Empty
-from acts_contrib.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
+from acts.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
class EnergyTest(BluetoothBaseTest):
diff --git a/acts_tests/tests/google/bt/test_tools/ToolsTest.py b/acts_tests/tests/google/bt/test_tools/ToolsTest.py
index 5bffd6f..eabf5fc 100644
--- a/acts_tests/tests/google/bt/test_tools/ToolsTest.py
+++ b/acts_tests/tests/google/bt/test_tools/ToolsTest.py
@@ -14,8 +14,8 @@
# License for the specific language governing permissions and limitations under
# the License.
-from acts_contrib.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
-from acts_contrib.test_utils.bt.bt_test_utils import *
+from acts.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
+from acts.test_utils.bt.bt_test_utils import *
import time
import pprint
diff --git a/acts_tests/tests/google/coex/functionality_tests/CoexBasicFunctionalityTest.py b/acts_tests/tests/google/coex/functionality_tests/CoexBasicFunctionalityTest.py
index 1775b9e..38db103 100644
--- a/acts_tests/tests/google/coex/functionality_tests/CoexBasicFunctionalityTest.py
+++ b/acts_tests/tests/google/coex/functionality_tests/CoexBasicFunctionalityTest.py
@@ -21,11 +21,11 @@
One Android device.
"""
-from acts_contrib.test_utils.coex.CoexBaseTest import CoexBaseTest
-from acts_contrib.test_utils.coex.coex_test_utils import multithread_func
-from acts_contrib.test_utils.coex.coex_test_utils import perform_classic_discovery
-from acts_contrib.test_utils.coex.coex_test_utils import toggle_bluetooth
-from acts_contrib.test_utils.coex.coex_test_utils import start_fping
+from acts.test_utils.coex.CoexBaseTest import CoexBaseTest
+from acts.test_utils.coex.coex_test_utils import multithread_func
+from acts.test_utils.coex.coex_test_utils import perform_classic_discovery
+from acts.test_utils.coex.coex_test_utils import toggle_bluetooth
+from acts.test_utils.coex.coex_test_utils import start_fping
class CoexBasicFunctionalityTest(CoexBaseTest):
diff --git a/acts_tests/tests/google/coex/functionality_tests/CoexBtMultiProfileFunctionalityTest.py b/acts_tests/tests/google/coex/functionality_tests/CoexBtMultiProfileFunctionalityTest.py
index 1acfc0c..53dc7fa 100644
--- a/acts_tests/tests/google/coex/functionality_tests/CoexBtMultiProfileFunctionalityTest.py
+++ b/acts_tests/tests/google/coex/functionality_tests/CoexBtMultiProfileFunctionalityTest.py
@@ -21,15 +21,15 @@
Two Android device.
One A2DP and HFP Headset connected to Relay.
"""
-from acts_contrib.test_utils.bt import BtEnum
-from acts_contrib.test_utils.bt.bt_test_utils import clear_bonded_devices
-from acts_contrib.test_utils.coex.CoexBaseTest import CoexBaseTest
-from acts_contrib.test_utils.coex.coex_test_utils import connect_ble
-from acts_contrib.test_utils.coex.coex_test_utils import initiate_disconnect_from_hf
-from acts_contrib.test_utils.coex.coex_test_utils import multithread_func
-from acts_contrib.test_utils.coex.coex_test_utils import music_play_and_check_via_app
-from acts_contrib.test_utils.coex.coex_test_utils import pair_and_connect_headset
-from acts_contrib.test_utils.coex.coex_test_utils import setup_tel_config
+from acts.test_utils.bt import BtEnum
+from acts.test_utils.bt.bt_test_utils import clear_bonded_devices
+from acts.test_utils.coex.CoexBaseTest import CoexBaseTest
+from acts.test_utils.coex.coex_test_utils import connect_ble
+from acts.test_utils.coex.coex_test_utils import initiate_disconnect_from_hf
+from acts.test_utils.coex.coex_test_utils import multithread_func
+from acts.test_utils.coex.coex_test_utils import music_play_and_check_via_app
+from acts.test_utils.coex.coex_test_utils import pair_and_connect_headset
+from acts.test_utils.coex.coex_test_utils import setup_tel_config
class CoexBtMultiProfileFunctionalityTest(CoexBaseTest):
diff --git a/acts_tests/tests/google/coex/functionality_tests/WlanWithHfpFunctionalityTest.py b/acts_tests/tests/google/coex/functionality_tests/WlanWithHfpFunctionalityTest.py
index f6aadc3..f03ade0 100644
--- a/acts_tests/tests/google/coex/functionality_tests/WlanWithHfpFunctionalityTest.py
+++ b/acts_tests/tests/google/coex/functionality_tests/WlanWithHfpFunctionalityTest.py
@@ -14,21 +14,21 @@
# License for the specific language governing permissions and limitations under
# the License.
-from acts_contrib.test_utils.bt import BtEnum
-from acts_contrib.test_utils.bt.bt_test_utils import clear_bonded_devices
-from acts_contrib.test_utils.coex.CoexBaseTest import CoexBaseTest
-from acts_contrib.test_utils.coex.coex_test_utils import connect_dev_to_headset
-from acts_contrib.test_utils.coex.coex_test_utils import connect_wlan_profile
-from acts_contrib.test_utils.coex.coex_test_utils import initiate_disconnect_from_hf
-from acts_contrib.test_utils.coex.coex_test_utils import initiate_disconnect_call_dut
-from acts_contrib.test_utils.coex.coex_test_utils import multithread_func
-from acts_contrib.test_utils.coex.coex_test_utils import pair_and_connect_headset
-from acts_contrib.test_utils.coex.coex_test_utils import perform_classic_discovery
-from acts_contrib.test_utils.coex.coex_test_utils import toggle_screen_state
-from acts_contrib.test_utils.coex.coex_test_utils import setup_tel_config
-from acts_contrib.test_utils.coex.coex_test_utils import start_fping
-from acts_contrib.test_utils.tel.tel_test_utils import hangup_call
-from acts_contrib.test_utils.tel.tel_test_utils import initiate_call
+from acts.test_utils.bt import BtEnum
+from acts.test_utils.bt.bt_test_utils import clear_bonded_devices
+from acts.test_utils.coex.CoexBaseTest import CoexBaseTest
+from acts.test_utils.coex.coex_test_utils import connect_dev_to_headset
+from acts.test_utils.coex.coex_test_utils import connect_wlan_profile
+from acts.test_utils.coex.coex_test_utils import initiate_disconnect_from_hf
+from acts.test_utils.coex.coex_test_utils import initiate_disconnect_call_dut
+from acts.test_utils.coex.coex_test_utils import multithread_func
+from acts.test_utils.coex.coex_test_utils import pair_and_connect_headset
+from acts.test_utils.coex.coex_test_utils import perform_classic_discovery
+from acts.test_utils.coex.coex_test_utils import toggle_screen_state
+from acts.test_utils.coex.coex_test_utils import setup_tel_config
+from acts.test_utils.coex.coex_test_utils import start_fping
+from acts.test_utils.tel.tel_test_utils import hangup_call
+from acts.test_utils.tel.tel_test_utils import initiate_call
BLUETOOTH_WAIT_TIME = 2
diff --git a/acts_tests/tests/google/coex/hotspot_tests/HotspotWiFiChannelTest.py b/acts_tests/tests/google/coex/hotspot_tests/HotspotWiFiChannelTest.py
index 2a26d88..b276a3a 100644
--- a/acts_tests/tests/google/coex/hotspot_tests/HotspotWiFiChannelTest.py
+++ b/acts_tests/tests/google/coex/hotspot_tests/HotspotWiFiChannelTest.py
@@ -25,16 +25,16 @@
import acts.base_test
import acts.controllers.rohdeschwarz_lib.cmw500 as cmw500
-from acts_contrib.test_utils.coex.hotspot_utils import band_channel_map
-from acts_contrib.test_utils.coex.hotspot_utils import supported_lte_bands
-from acts_contrib.test_utils.coex.hotspot_utils import tdd_band_list
-from acts_contrib.test_utils.coex.hotspot_utils import wifi_channel_map
-from acts_contrib.test_utils.tel.tel_test_utils import toggle_airplane_mode
-from acts_contrib.test_utils.wifi.wifi_test_utils import reset_wifi
-from acts_contrib.test_utils.wifi.wifi_test_utils import start_wifi_tethering
-from acts_contrib.test_utils.wifi.wifi_test_utils import stop_wifi_tethering
-from acts_contrib.test_utils.wifi.wifi_test_utils import wifi_connect
-from acts_contrib.test_utils.wifi.wifi_test_utils import WifiEnums
+from acts.test_utils.coex.hotspot_utils import band_channel_map
+from acts.test_utils.coex.hotspot_utils import supported_lte_bands
+from acts.test_utils.coex.hotspot_utils import tdd_band_list
+from acts.test_utils.coex.hotspot_utils import wifi_channel_map
+from acts.test_utils.tel.tel_test_utils import toggle_airplane_mode
+from acts.test_utils.wifi.wifi_test_utils import reset_wifi
+from acts.test_utils.wifi.wifi_test_utils import start_wifi_tethering
+from acts.test_utils.wifi.wifi_test_utils import stop_wifi_tethering
+from acts.test_utils.wifi.wifi_test_utils import wifi_connect
+from acts.test_utils.wifi.wifi_test_utils import WifiEnums
BANDWIDTH_2G = 20
CNSS_LOG_PATH = '/data/vendor/wifi/wlan_logs'
diff --git a/acts_tests/tests/google/coex/performance_tests/CoexBasicPerformanceTest.py b/acts_tests/tests/google/coex/performance_tests/CoexBasicPerformanceTest.py
index 76d7151..c5c1879 100644
--- a/acts_tests/tests/google/coex/performance_tests/CoexBasicPerformanceTest.py
+++ b/acts_tests/tests/google/coex/performance_tests/CoexBasicPerformanceTest.py
@@ -16,9 +16,9 @@
import itertools
-from acts_contrib.test_utils.bt.bt_test_utils import enable_bluetooth
-from acts_contrib.test_utils.coex.CoexPerformanceBaseTest import CoexPerformanceBaseTest
-from acts_contrib.test_utils.coex.coex_test_utils import perform_classic_discovery
+from acts.test_utils.bt.bt_test_utils import enable_bluetooth
+from acts.test_utils.coex.CoexPerformanceBaseTest import CoexPerformanceBaseTest
+from acts.test_utils.coex.coex_test_utils import perform_classic_discovery
class CoexBasicPerformanceTest(CoexPerformanceBaseTest):
diff --git a/acts_tests/tests/google/coex/performance_tests/CoexBtMultiProfilePerformanceTest.py b/acts_tests/tests/google/coex/performance_tests/CoexBtMultiProfilePerformanceTest.py
index de36052..af75373 100644
--- a/acts_tests/tests/google/coex/performance_tests/CoexBtMultiProfilePerformanceTest.py
+++ b/acts_tests/tests/google/coex/performance_tests/CoexBtMultiProfilePerformanceTest.py
@@ -24,18 +24,18 @@
"""
import time
-from acts_contrib.test_utils.bt import BtEnum
-from acts_contrib.test_utils.bt.bt_test_utils import clear_bonded_devices
-from acts_contrib.test_utils.car.tel_telecom_utils import wait_for_dialing
-from acts_contrib.test_utils.coex.CoexPerformanceBaseTest import CoexPerformanceBaseTest
-from acts_contrib.test_utils.coex.coex_test_utils import connect_dev_to_headset
-from acts_contrib.test_utils.coex.coex_test_utils import music_play_and_check_via_app
-from acts_contrib.test_utils.coex.coex_test_utils import pair_and_connect_headset
-from acts_contrib.test_utils.coex.coex_test_utils import setup_tel_config
-from acts_contrib.test_utils.coex.coex_test_utils import connect_wlan_profile
-from acts_contrib.test_utils.tel.tel_test_utils import hangup_call
-from acts_contrib.test_utils.tel.tel_test_utils import initiate_call
-from acts_contrib.test_utils.tel.tel_test_utils import wait_and_answer_call
+from acts.test_utils.bt import BtEnum
+from acts.test_utils.bt.bt_test_utils import clear_bonded_devices
+from acts.test_utils.car.tel_telecom_utils import wait_for_dialing
+from acts.test_utils.coex.CoexPerformanceBaseTest import CoexPerformanceBaseTest
+from acts.test_utils.coex.coex_test_utils import connect_dev_to_headset
+from acts.test_utils.coex.coex_test_utils import music_play_and_check_via_app
+from acts.test_utils.coex.coex_test_utils import pair_and_connect_headset
+from acts.test_utils.coex.coex_test_utils import setup_tel_config
+from acts.test_utils.coex.coex_test_utils import connect_wlan_profile
+from acts.test_utils.tel.tel_test_utils import hangup_call
+from acts.test_utils.tel.tel_test_utils import initiate_call
+from acts.test_utils.tel.tel_test_utils import wait_and_answer_call
class CoexBtMultiProfilePerformanceTest(CoexPerformanceBaseTest):
diff --git a/acts_tests/tests/google/coex/performance_tests/WlanStandalonePerformanceTest.py b/acts_tests/tests/google/coex/performance_tests/WlanStandalonePerformanceTest.py
index 4aea4e2..8edd0c5 100644
--- a/acts_tests/tests/google/coex/performance_tests/WlanStandalonePerformanceTest.py
+++ b/acts_tests/tests/google/coex/performance_tests/WlanStandalonePerformanceTest.py
@@ -16,8 +16,8 @@
import itertools
-from acts_contrib.test_utils.coex.CoexPerformanceBaseTest import CoexPerformanceBaseTest
-from acts_contrib.test_utils.bt.bt_test_utils import disable_bluetooth
+from acts.test_utils.coex.CoexPerformanceBaseTest import CoexPerformanceBaseTest
+from acts.test_utils.bt.bt_test_utils import disable_bluetooth
class WlanStandalonePerformanceTest(CoexPerformanceBaseTest):
diff --git a/acts_tests/tests/google/coex/performance_tests/WlanWithA2dpPerformanceTest.py b/acts_tests/tests/google/coex/performance_tests/WlanWithA2dpPerformanceTest.py
index 01e177f..e06b4c6 100644
--- a/acts_tests/tests/google/coex/performance_tests/WlanWithA2dpPerformanceTest.py
+++ b/acts_tests/tests/google/coex/performance_tests/WlanWithA2dpPerformanceTest.py
@@ -16,15 +16,15 @@
import itertools
-from acts_contrib.test_utils.abstract_devices.bluetooth_handsfree_abstract_device import BluetoothHandsfreeAbstractDeviceFactory as bf
-from acts_contrib.test_utils.bt import BtEnum
-from acts_contrib.test_utils.bt.bt_test_utils import clear_bonded_devices
-from acts_contrib.test_utils.coex.CoexPerformanceBaseTest import CoexPerformanceBaseTest
-from acts_contrib.test_utils.coex.coex_test_utils import avrcp_actions
-from acts_contrib.test_utils.coex.coex_test_utils import music_play_and_check
-from acts_contrib.test_utils.coex.coex_test_utils import pair_and_connect_headset
-from acts_contrib.test_utils.coex.coex_test_utils import perform_classic_discovery
-from acts_contrib.test_utils.coex.coex_test_utils import push_music_to_android_device
+from acts.test_utils.abstract_devices.bluetooth_handsfree_abstract_device import BluetoothHandsfreeAbstractDeviceFactory as bf
+from acts.test_utils.bt import BtEnum
+from acts.test_utils.bt.bt_test_utils import clear_bonded_devices
+from acts.test_utils.coex.CoexPerformanceBaseTest import CoexPerformanceBaseTest
+from acts.test_utils.coex.coex_test_utils import avrcp_actions
+from acts.test_utils.coex.coex_test_utils import music_play_and_check
+from acts.test_utils.coex.coex_test_utils import pair_and_connect_headset
+from acts.test_utils.coex.coex_test_utils import perform_classic_discovery
+from acts.test_utils.coex.coex_test_utils import push_music_to_android_device
class WlanWithA2dpPerformanceTest(CoexPerformanceBaseTest):
diff --git a/acts_tests/tests/google/coex/performance_tests/WlanWithBlePerformanceTest.py b/acts_tests/tests/google/coex/performance_tests/WlanWithBlePerformanceTest.py
index e3179df..23d7423 100644
--- a/acts_tests/tests/google/coex/performance_tests/WlanWithBlePerformanceTest.py
+++ b/acts_tests/tests/google/coex/performance_tests/WlanWithBlePerformanceTest.py
@@ -17,12 +17,12 @@
import itertools
import time
-from acts_contrib.test_utils.bt.bt_gatt_utils import close_gatt_client
-from acts_contrib.test_utils.bt.bt_gatt_utils import disconnect_gatt_connection
-from acts_contrib.test_utils.bt.bt_gatt_utils import GattTestUtilsError
-from acts_contrib.test_utils.bt.bt_gatt_utils import orchestrate_gatt_connection
-from acts_contrib.test_utils.bt.bt_test_utils import generate_ble_scan_objects
-from acts_contrib.test_utils.coex.CoexPerformanceBaseTest import CoexPerformanceBaseTest
+from acts.test_utils.bt.bt_gatt_utils import close_gatt_client
+from acts.test_utils.bt.bt_gatt_utils import disconnect_gatt_connection
+from acts.test_utils.bt.bt_gatt_utils import GattTestUtilsError
+from acts.test_utils.bt.bt_gatt_utils import orchestrate_gatt_connection
+from acts.test_utils.bt.bt_test_utils import generate_ble_scan_objects
+from acts.test_utils.coex.CoexPerformanceBaseTest import CoexPerformanceBaseTest
class WlanWithBlePerformanceTest(CoexPerformanceBaseTest):
diff --git a/acts_tests/tests/google/coex/performance_tests/WlanWithHfpPerformanceTest.py b/acts_tests/tests/google/coex/performance_tests/WlanWithHfpPerformanceTest.py
index b56cbde..bec999e 100644
--- a/acts_tests/tests/google/coex/performance_tests/WlanWithHfpPerformanceTest.py
+++ b/acts_tests/tests/google/coex/performance_tests/WlanWithHfpPerformanceTest.py
@@ -16,14 +16,14 @@
import time
-from acts_contrib.test_utils.bt import BtEnum
-from acts_contrib.test_utils.bt.bt_test_utils import clear_bonded_devices
-from acts_contrib.test_utils.coex.CoexPerformanceBaseTest import CoexPerformanceBaseTest
-from acts_contrib.test_utils.coex.coex_test_utils import initiate_disconnect_from_hf
-from acts_contrib.test_utils.coex.coex_test_utils import pair_and_connect_headset
-from acts_contrib.test_utils.coex.coex_test_utils import setup_tel_config
-from acts_contrib.test_utils.tel.tel_test_utils import hangup_call
-from acts_contrib.test_utils.tel.tel_test_utils import initiate_call
+from acts.test_utils.bt import BtEnum
+from acts.test_utils.bt.bt_test_utils import clear_bonded_devices
+from acts.test_utils.coex.CoexPerformanceBaseTest import CoexPerformanceBaseTest
+from acts.test_utils.coex.coex_test_utils import initiate_disconnect_from_hf
+from acts.test_utils.coex.coex_test_utils import pair_and_connect_headset
+from acts.test_utils.coex.coex_test_utils import setup_tel_config
+from acts.test_utils.tel.tel_test_utils import hangup_call
+from acts.test_utils.tel.tel_test_utils import initiate_call
class WlanWithHfpPerformanceTest(CoexPerformanceBaseTest):
diff --git a/acts_tests/tests/google/coex/stress_tests/CoexBasicStressTest.py b/acts_tests/tests/google/coex/stress_tests/CoexBasicStressTest.py
index 60881de..1bd7b06 100644
--- a/acts_tests/tests/google/coex/stress_tests/CoexBasicStressTest.py
+++ b/acts_tests/tests/google/coex/stress_tests/CoexBasicStressTest.py
@@ -22,9 +22,9 @@
"""
import time
-from acts_contrib.test_utils.coex.CoexBaseTest import CoexBaseTest
-from acts_contrib.test_utils.coex.coex_test_utils import toggle_bluetooth
-from acts_contrib.test_utils.coex.coex_test_utils import device_discoverable
+from acts.test_utils.coex.CoexBaseTest import CoexBaseTest
+from acts.test_utils.coex.coex_test_utils import toggle_bluetooth
+from acts.test_utils.coex.coex_test_utils import device_discoverable
class CoexBasicStressTest(CoexBaseTest):
diff --git a/acts_tests/tests/google/coex/stress_tests/CoexBtMultiProfileStressTest.py b/acts_tests/tests/google/coex/stress_tests/CoexBtMultiProfileStressTest.py
index a709dda..5516bec 100644
--- a/acts_tests/tests/google/coex/stress_tests/CoexBtMultiProfileStressTest.py
+++ b/acts_tests/tests/google/coex/stress_tests/CoexBtMultiProfileStressTest.py
@@ -22,11 +22,11 @@
"""
import time
-from acts_contrib.test_utils.bt import BtEnum
-from acts_contrib.test_utils.bt.bt_test_utils import clear_bonded_devices
-from acts_contrib.test_utils.coex.CoexBaseTest import CoexBaseTest
-from acts_contrib.test_utils.coex.coex_test_utils import disconnect_headset_from_dev
-from acts_contrib.test_utils.coex.coex_test_utils import pair_and_connect_headset
+from acts.test_utils.bt import BtEnum
+from acts.test_utils.bt.bt_test_utils import clear_bonded_devices
+from acts.test_utils.coex.CoexBaseTest import CoexBaseTest
+from acts.test_utils.coex.coex_test_utils import disconnect_headset_from_dev
+from acts.test_utils.coex.coex_test_utils import pair_and_connect_headset
class CoexBtMultiProfileStressTest(CoexBaseTest):
diff --git a/acts_tests/tests/google/coex/stress_tests/CoexHfpStressTest.py b/acts_tests/tests/google/coex/stress_tests/CoexHfpStressTest.py
index 8add009..b210d59 100644
--- a/acts_tests/tests/google/coex/stress_tests/CoexHfpStressTest.py
+++ b/acts_tests/tests/google/coex/stress_tests/CoexHfpStressTest.py
@@ -16,18 +16,18 @@
import time
-from acts_contrib.test_utils.bt import BtEnum
-from acts_contrib.test_utils.bt.bt_test_utils import clear_bonded_devices
-from acts_contrib.test_utils.coex.CoexBaseTest import CoexBaseTest
-from acts_contrib.test_utils.coex.coex_test_utils import connect_dev_to_headset
-from acts_contrib.test_utils.coex.coex_test_utils import disconnect_headset_from_dev
-from acts_contrib.test_utils.coex.coex_test_utils import initiate_disconnect_from_hf
-from acts_contrib.test_utils.coex.coex_test_utils import pair_and_connect_headset
-from acts_contrib.test_utils.tel.tel_defines import AUDIO_ROUTE_BLUETOOTH
-from acts_contrib.test_utils.tel.tel_defines import AUDIO_ROUTE_SPEAKER
+from acts.test_utils.bt import BtEnum
+from acts.test_utils.bt.bt_test_utils import clear_bonded_devices
+from acts.test_utils.coex.CoexBaseTest import CoexBaseTest
+from acts.test_utils.coex.coex_test_utils import connect_dev_to_headset
+from acts.test_utils.coex.coex_test_utils import disconnect_headset_from_dev
+from acts.test_utils.coex.coex_test_utils import initiate_disconnect_from_hf
+from acts.test_utils.coex.coex_test_utils import pair_and_connect_headset
+from acts.test_utils.tel.tel_defines import AUDIO_ROUTE_BLUETOOTH
+from acts.test_utils.tel.tel_defines import AUDIO_ROUTE_SPEAKER
-from acts_contrib.test_utils.tel.tel_test_utils import hangup_call
-from acts_contrib.test_utils.tel.tel_voice_utils import set_audio_route
+from acts.test_utils.tel.tel_test_utils import hangup_call
+from acts.test_utils.tel.tel_voice_utils import set_audio_route
class CoexHfpStressTest(CoexBaseTest):
diff --git a/acts_tests/tests/google/experimental/BluetoothLatencyTest.py b/acts_tests/tests/google/experimental/BluetoothLatencyTest.py
index 6ccc949..ea6ed4a 100644
--- a/acts_tests/tests/google/experimental/BluetoothLatencyTest.py
+++ b/acts_tests/tests/google/experimental/BluetoothLatencyTest.py
@@ -22,13 +22,13 @@
from acts.base_test import BaseTestClass
from acts.signals import TestPass
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
-from acts_contrib.test_utils.bt.bt_test_utils import orchestrate_rfcomm_connection
-from acts_contrib.test_utils.bt.bt_test_utils import setup_multiple_devices_for_bt_test
-from acts_contrib.test_utils.bt.bt_test_utils import verify_server_and_client_connected
-from acts_contrib.test_utils.bt.bt_test_utils import write_read_verify_data
-from acts_contrib.test_utils.bt.loggers.bluetooth_metric_logger import BluetoothMetricLogger
-from acts_contrib.test_utils.bt.loggers.protos import bluetooth_metric_pb2 as proto_module
+from acts.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
+from acts.test_utils.bt.bt_test_utils import orchestrate_rfcomm_connection
+from acts.test_utils.bt.bt_test_utils import setup_multiple_devices_for_bt_test
+from acts.test_utils.bt.bt_test_utils import verify_server_and_client_connected
+from acts.test_utils.bt.bt_test_utils import write_read_verify_data
+from acts.test_utils.bt.loggers.bluetooth_metric_logger import BluetoothMetricLogger
+from acts.test_utils.bt.loggers.protos import bluetooth_metric_pb2 as proto_module
from acts.utils import set_location_service
diff --git a/acts_tests/tests/google/experimental/BluetoothPairAndConnectTest.py b/acts_tests/tests/google/experimental/BluetoothPairAndConnectTest.py
index 2040af5..2402fb5 100644
--- a/acts_tests/tests/google/experimental/BluetoothPairAndConnectTest.py
+++ b/acts_tests/tests/google/experimental/BluetoothPairAndConnectTest.py
@@ -28,11 +28,11 @@
from acts.signals import TestFailure
from acts.signals import TestPass
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
-from acts_contrib.test_utils.bt.bt_test_utils import factory_reset_bluetooth
-from acts_contrib.test_utils.bt.bt_test_utils import enable_bluetooth
-from acts_contrib.test_utils.bt.bt_test_utils import setup_multiple_devices_for_bt_test
-from acts_contrib.test_utils.bt.loggers.bluetooth_metric_logger import BluetoothMetricLogger
+from acts.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
+from acts.test_utils.bt.bt_test_utils import factory_reset_bluetooth
+from acts.test_utils.bt.bt_test_utils import enable_bluetooth
+from acts.test_utils.bt.bt_test_utils import setup_multiple_devices_for_bt_test
+from acts.test_utils.bt.loggers.bluetooth_metric_logger import BluetoothMetricLogger
from acts.utils import set_location_service
diff --git a/acts_tests/tests/google/experimental/BluetoothReconnectTest.py b/acts_tests/tests/google/experimental/BluetoothReconnectTest.py
index dc66486..5339e51 100644
--- a/acts_tests/tests/google/experimental/BluetoothReconnectTest.py
+++ b/acts_tests/tests/google/experimental/BluetoothReconnectTest.py
@@ -25,10 +25,10 @@
from acts.signals import TestFailure
from acts.signals import TestPass
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
-from acts_contrib.test_utils.bt.bt_test_utils import enable_bluetooth
-from acts_contrib.test_utils.bt.bt_test_utils import setup_multiple_devices_for_bt_test
-from acts_contrib.test_utils.bt.loggers.bluetooth_metric_logger import BluetoothMetricLogger
+from acts.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
+from acts.test_utils.bt.bt_test_utils import enable_bluetooth
+from acts.test_utils.bt.bt_test_utils import setup_multiple_devices_for_bt_test
+from acts.test_utils.bt.loggers.bluetooth_metric_logger import BluetoothMetricLogger
from acts.utils import set_location_service
# The number of reconnections to be attempted during the test
diff --git a/acts_tests/tests/google/experimental/BluetoothThroughputTest.py b/acts_tests/tests/google/experimental/BluetoothThroughputTest.py
index f1d8dba..1f53172 100644
--- a/acts_tests/tests/google/experimental/BluetoothThroughputTest.py
+++ b/acts_tests/tests/google/experimental/BluetoothThroughputTest.py
@@ -19,12 +19,12 @@
from acts.base_test import BaseTestClass
from acts.signals import TestPass
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
-from acts_contrib.test_utils.bt.bt_test_utils import orchestrate_rfcomm_connection
-from acts_contrib.test_utils.bt.bt_test_utils import setup_multiple_devices_for_bt_test
-from acts_contrib.test_utils.bt.bt_test_utils import verify_server_and_client_connected
-from acts_contrib.test_utils.bt.loggers.bluetooth_metric_logger import BluetoothMetricLogger
-from acts_contrib.test_utils.bt.loggers.protos import bluetooth_metric_pb2 as proto_module
+from acts.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
+from acts.test_utils.bt.bt_test_utils import orchestrate_rfcomm_connection
+from acts.test_utils.bt.bt_test_utils import setup_multiple_devices_for_bt_test
+from acts.test_utils.bt.bt_test_utils import verify_server_and_client_connected
+from acts.test_utils.bt.loggers.bluetooth_metric_logger import BluetoothMetricLogger
+from acts.test_utils.bt.loggers.protos import bluetooth_metric_pb2 as proto_module
from acts.utils import set_location_service
diff --git a/acts_tests/tests/google/fuchsia/backlight/BacklightTest.py b/acts_tests/tests/google/fuchsia/backlight/BacklightTest.py
index 9cc6c0c..9d15781 100644
--- a/acts_tests/tests/google/fuchsia/backlight/BacklightTest.py
+++ b/acts_tests/tests/google/fuchsia/backlight/BacklightTest.py
@@ -21,7 +21,7 @@
from acts import asserts, signals
from acts.base_test import BaseTestClass
from acts.libs.proc.job import Error
-from acts_contrib.test_utils.tel.tel_test_utils import setup_droid_properties
+from acts.test_utils.tel.tel_test_utils import setup_droid_properties
BRIGHTNESS_CHANGE_SLEEP_TIME_SECONDS = 2
diff --git a/acts_tests/tests/google/fuchsia/bt/BleFuchsiaAndroidTest.py b/acts_tests/tests/google/fuchsia/bt/BleFuchsiaAndroidTest.py
index 636db87..e799991 100644
--- a/acts_tests/tests/google/fuchsia/bt/BleFuchsiaAndroidTest.py
+++ b/acts_tests/tests/google/fuchsia/bt/BleFuchsiaAndroidTest.py
@@ -22,14 +22,14 @@
import time
from acts.controllers import android_device
-from acts_contrib.test_utils.fuchsia.bt_test_utils import le_scan_for_device_by_name
-from acts_contrib.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
-from acts_contrib.test_utils.bt.bt_constants import ble_advertise_settings_modes
-from acts_contrib.test_utils.bt.bt_constants import adv_succ
-from acts_contrib.test_utils.bt.bt_constants import ble_scan_settings_modes
-from acts_contrib.test_utils.bt.bt_constants import scan_result
-from acts_contrib.test_utils.bt.bt_test_utils import cleanup_scanners_and_advertisers
-from acts_contrib.test_utils.bt.bt_test_utils import reset_bluetooth
+from acts.test_utils.fuchsia.bt_test_utils import le_scan_for_device_by_name
+from acts.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
+from acts.test_utils.bt.bt_constants import ble_advertise_settings_modes
+from acts.test_utils.bt.bt_constants import adv_succ
+from acts.test_utils.bt.bt_constants import ble_scan_settings_modes
+from acts.test_utils.bt.bt_constants import scan_result
+from acts.test_utils.bt.bt_test_utils import cleanup_scanners_and_advertisers
+from acts.test_utils.bt.bt_test_utils import reset_bluetooth
class BleFuchsiaAndroidTest(BluetoothBaseTest):
diff --git a/acts_tests/tests/google/fuchsia/bt/BleFuchsiaTest.py b/acts_tests/tests/google/fuchsia/bt/BleFuchsiaTest.py
index a74db66..e0efc77 100644
--- a/acts_tests/tests/google/fuchsia/bt/BleFuchsiaTest.py
+++ b/acts_tests/tests/google/fuchsia/bt/BleFuchsiaTest.py
@@ -21,7 +21,7 @@
import time
from acts.base_test import BaseTestClass
-from acts_contrib.test_utils.fuchsia.bt_test_utils import le_scan_for_device_by_name
+from acts.test_utils.fuchsia.bt_test_utils import le_scan_for_device_by_name
class BleFuchsiaTest(BaseTestClass):
diff --git a/acts_tests/tests/google/fuchsia/bt/FuchsiaBtMacAddressTest.py b/acts_tests/tests/google/fuchsia/bt/FuchsiaBtMacAddressTest.py
index 2ce6b54..e368127 100644
--- a/acts_tests/tests/google/fuchsia/bt/FuchsiaBtMacAddressTest.py
+++ b/acts_tests/tests/google/fuchsia/bt/FuchsiaBtMacAddressTest.py
@@ -26,7 +26,7 @@
from acts import signals
from acts.base_test import BaseTestClass
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.bt.bt_test_utils import generate_id_by_size
+from acts.test_utils.bt.bt_test_utils import generate_id_by_size
class FuchsiaBtMacAddressTest(BaseTestClass):
diff --git a/acts_tests/tests/google/fuchsia/bt/FuchsiaBtScanTest.py b/acts_tests/tests/google/fuchsia/bt/FuchsiaBtScanTest.py
index 074d3e5..72103e9 100644
--- a/acts_tests/tests/google/fuchsia/bt/FuchsiaBtScanTest.py
+++ b/acts_tests/tests/google/fuchsia/bt/FuchsiaBtScanTest.py
@@ -26,7 +26,7 @@
from acts import signals
from acts.base_test import BaseTestClass
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.bt.bt_test_utils import generate_id_by_size
+from acts.test_utils.bt.bt_test_utils import generate_id_by_size
class FuchsiaBtScanTest(BaseTestClass):
diff --git a/acts_tests/tests/google/fuchsia/bt/command_input.py b/acts_tests/tests/google/fuchsia/bt/command_input.py
index 75d904c..872a896 100644
--- a/acts_tests/tests/google/fuchsia/bt/command_input.py
+++ b/acts_tests/tests/google/fuchsia/bt/command_input.py
@@ -43,13 +43,13 @@
"""
-from acts_contrib.test_utils.abstract_devices.bluetooth_device import create_bluetooth_device
-from acts_contrib.test_utils.bt.bt_constants import bt_attribute_values
-from acts_contrib.test_utils.bt.bt_constants import sig_appearance_constants
-from acts_contrib.test_utils.bt.bt_constants import sig_uuid_constants
-from acts_contrib.test_utils.fuchsia.sdp_records import sdp_pts_record_list
+from acts.test_utils.abstract_devices.bluetooth_device import create_bluetooth_device
+from acts.test_utils.bt.bt_constants import bt_attribute_values
+from acts.test_utils.bt.bt_constants import sig_appearance_constants
+from acts.test_utils.bt.bt_constants import sig_uuid_constants
+from acts.test_utils.fuchsia.sdp_records import sdp_pts_record_list
-import acts_contrib.test_utils.bt.gatt_test_database as gatt_test_database
+import acts.test_utils.bt.gatt_test_database as gatt_test_database
import cmd
import pprint
@@ -1391,7 +1391,7 @@
Supports Tab Autocomplete.
Input(s):
descriptor_db_name: The descriptor db name that matches one in
- acts_contrib.test_utils.bt.gatt_test_database
+ acts.test_utils.bt.gatt_test_database
Usage:
Examples:
gatts_setup_database LARGE_DB_1
diff --git a/acts_tests/tests/google/fuchsia/bt/gatt/GattConnectionStressTest.py b/acts_tests/tests/google/fuchsia/bt/gatt/GattConnectionStressTest.py
index da7d641..2f2e666 100644
--- a/acts_tests/tests/google/fuchsia/bt/gatt/GattConnectionStressTest.py
+++ b/acts_tests/tests/google/fuchsia/bt/gatt/GattConnectionStressTest.py
@@ -30,8 +30,8 @@
from acts import signals
from acts.base_test import BaseTestClass
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.bt.bt_test_utils import generate_id_by_size
-from acts_contrib.test_utils.fuchsia.bt_test_utils import le_scan_for_device_by_name
+from acts.test_utils.bt.bt_test_utils import generate_id_by_size
+from acts.test_utils.fuchsia.bt_test_utils import le_scan_for_device_by_name
import time
diff --git a/acts_tests/tests/google/fuchsia/bt/gatt/gatt_server_databases.py b/acts_tests/tests/google/fuchsia/bt/gatt/gatt_server_databases.py
index c854281..c554405 100644
--- a/acts_tests/tests/google/fuchsia/bt/gatt/gatt_server_databases.py
+++ b/acts_tests/tests/google/fuchsia/bt/gatt/gatt_server_databases.py
@@ -18,12 +18,12 @@
GATT server dictionaries which will be setup in various tests.
"""
-from acts_contrib.test_utils.bt.bt_constants import gatt_characteristic
-from acts_contrib.test_utils.bt.bt_constants import gatt_descriptor
-from acts_contrib.test_utils.bt.bt_constants import gatt_service_types
-from acts_contrib.test_utils.bt.bt_constants import gatt_char_types
-from acts_contrib.test_utils.bt.bt_constants import gatt_characteristic_value_format
-from acts_contrib.test_utils.bt.bt_constants import gatt_char_desc_uuids
+from acts.test_utils.bt.bt_constants import gatt_characteristic
+from acts.test_utils.bt.bt_constants import gatt_descriptor
+from acts.test_utils.bt.bt_constants import gatt_service_types
+from acts.test_utils.bt.bt_constants import gatt_char_types
+from acts.test_utils.bt.bt_constants import gatt_characteristic_value_format
+from acts.test_utils.bt.bt_constants import gatt_char_desc_uuids
SINGLE_PRIMARY_SERVICE = {
diff --git a/acts_tests/tests/google/fuchsia/examples/Sl4fSanityTest.py b/acts_tests/tests/google/fuchsia/examples/Sl4fSanityTest.py
index d7491dd..d2116a9 100644
--- a/acts_tests/tests/google/fuchsia/examples/Sl4fSanityTest.py
+++ b/acts_tests/tests/google/fuchsia/examples/Sl4fSanityTest.py
@@ -24,7 +24,7 @@
import uuid
from acts import signals
-from acts_contrib.test_utils.tel.tel_test_utils import setup_droid_properties
+from acts.test_utils.tel.tel_test_utils import setup_droid_properties
class Sl4fSanityTest(BaseTestClass):
diff --git a/acts_tests/tests/google/fuchsia/netstack/NetstackIxiaTest.py b/acts_tests/tests/google/fuchsia/netstack/NetstackIxiaTest.py
index 129d28f..81d69bf 100644
--- a/acts_tests/tests/google/fuchsia/netstack/NetstackIxiaTest.py
+++ b/acts_tests/tests/google/fuchsia/netstack/NetstackIxiaTest.py
@@ -20,7 +20,7 @@
from acts.controllers.ap_lib import hostapd_constants
from acts.controllers.ap_lib import hostapd_security
-from acts_contrib.test_utils.net.NetstackBaseTest import NetstackBaseTest
+from acts.test_utils.net.NetstackBaseTest import NetstackBaseTest
from acts.utils import rand_ascii_str
diff --git a/acts_tests/tests/google/fuchsia/ram/RamTest.py b/acts_tests/tests/google/fuchsia/ram/RamTest.py
index 2b11e01..b9bd75c 100644
--- a/acts_tests/tests/google/fuchsia/ram/RamTest.py
+++ b/acts_tests/tests/google/fuchsia/ram/RamTest.py
@@ -21,7 +21,7 @@
from acts import asserts, signals
from acts.base_test import BaseTestClass
from acts.libs.proc.job import Error
-from acts_contrib.test_utils.tel.tel_test_utils import setup_droid_properties
+from acts.test_utils.tel.tel_test_utils import setup_droid_properties
# Some number bigger than the minimum 512k:
MEMORY_CYCLES_TO_MEASURE = 1024 * 1024
diff --git a/acts_tests/tests/google/fuchsia/wlan/BeaconLossTest.py b/acts_tests/tests/google/fuchsia/wlan/BeaconLossTest.py
index 00e61b3..2944707 100644
--- a/acts_tests/tests/google/fuchsia/wlan/BeaconLossTest.py
+++ b/acts_tests/tests/google/fuchsia/wlan/BeaconLossTest.py
@@ -31,11 +31,11 @@
from acts import utils
from acts.base_test import BaseTestClass
from acts.controllers.ap_lib import hostapd_constants
-from acts_contrib.test_utils.abstract_devices.utils_lib.wlan_utils import disconnect
-from acts_contrib.test_utils.abstract_devices.utils_lib.wlan_utils import setup_ap
-from acts_contrib.test_utils.abstract_devices.utils_lib.wlan_utils import associate
-from acts_contrib.test_utils.abstract_devices.wlan_device import create_wlan_device
-from acts_contrib.test_utils.abstract_devices.wlan_device_lib.AbstractDeviceWlanDeviceBaseTest import AbstractDeviceWlanDeviceBaseTest
+from acts.test_utils.abstract_devices.utils_lib.wlan_utils import disconnect
+from acts.test_utils.abstract_devices.utils_lib.wlan_utils import setup_ap
+from acts.test_utils.abstract_devices.utils_lib.wlan_utils import associate
+from acts.test_utils.abstract_devices.wlan_device import create_wlan_device
+from acts.test_utils.abstract_devices.wlan_device_lib.AbstractDeviceWlanDeviceBaseTest import AbstractDeviceWlanDeviceBaseTest
from acts.utils import rand_ascii_str
diff --git a/acts_tests/tests/google/fuchsia/wlan/ChannelSweepTest.py b/acts_tests/tests/google/fuchsia/wlan/ChannelSweepTest.py
index 57ecbb0..431a2a3 100644
--- a/acts_tests/tests/google/fuchsia/wlan/ChannelSweepTest.py
+++ b/acts_tests/tests/google/fuchsia/wlan/ChannelSweepTest.py
@@ -33,9 +33,9 @@
from acts.controllers.ap_lib import hostapd_constants
from acts.controllers.ap_lib.hostapd_security import Security
from acts.controllers.iperf_server import IPerfResult
-from acts_contrib.test_utils.abstract_devices.utils_lib import wlan_utils
-from acts_contrib.test_utils.abstract_devices.wlan_device import create_wlan_device
-from acts_contrib.test_utils.wifi.WifiBaseTest import WifiBaseTest
+from acts.test_utils.abstract_devices.utils_lib import wlan_utils
+from acts.test_utils.abstract_devices.wlan_device import create_wlan_device
+from acts.test_utils.wifi.WifiBaseTest import WifiBaseTest
N_CAPABILITIES_DEFAULT = [
hostapd_constants.N_CAPABILITY_LDPC, hostapd_constants.N_CAPABILITY_SGI20,
diff --git a/acts_tests/tests/google/fuchsia/wlan/ConnectionStressTest.py b/acts_tests/tests/google/fuchsia/wlan/ConnectionStressTest.py
index 7ad2fdb..836846e 100644
--- a/acts_tests/tests/google/fuchsia/wlan/ConnectionStressTest.py
+++ b/acts_tests/tests/google/fuchsia/wlan/ConnectionStressTest.py
@@ -26,13 +26,13 @@
from acts import signals
from acts.controllers.ap_lib import hostapd_constants
from acts.controllers.ap_lib import hostapd_security
-from acts_contrib.test_utils.abstract_devices.utils_lib.wlan_utils import setup_ap
-from acts_contrib.test_utils.abstract_devices.utils_lib.wlan_utils import associate
-from acts_contrib.test_utils.abstract_devices.utils_lib.wlan_utils import disconnect
-from acts_contrib.test_utils.abstract_devices.wlan_device import create_wlan_device
-from acts_contrib.test_utils.abstract_devices.wlan_device_lib.AbstractDeviceWlanDeviceBaseTest import AbstractDeviceWlanDeviceBaseTest
-from acts_contrib.test_utils.fuchsia import utils
-from acts_contrib.test_utils.tel.tel_test_utils import setup_droid_properties
+from acts.test_utils.abstract_devices.utils_lib.wlan_utils import setup_ap
+from acts.test_utils.abstract_devices.utils_lib.wlan_utils import associate
+from acts.test_utils.abstract_devices.utils_lib.wlan_utils import disconnect
+from acts.test_utils.abstract_devices.wlan_device import create_wlan_device
+from acts.test_utils.abstract_devices.wlan_device_lib.AbstractDeviceWlanDeviceBaseTest import AbstractDeviceWlanDeviceBaseTest
+from acts.test_utils.fuchsia import utils
+from acts.test_utils.tel.tel_test_utils import setup_droid_properties
from acts.utils import rand_ascii_str
diff --git a/acts_tests/tests/google/fuchsia/wlan/DownloadStressTest.py b/acts_tests/tests/google/fuchsia/wlan/DownloadStressTest.py
index 5fa4fbb..f3f3803 100644
--- a/acts_tests/tests/google/fuchsia/wlan/DownloadStressTest.py
+++ b/acts_tests/tests/google/fuchsia/wlan/DownloadStressTest.py
@@ -24,10 +24,10 @@
from acts.base_test import BaseTestClass
from acts import signals
from acts.controllers.ap_lib import hostapd_constants
-from acts_contrib.test_utils.abstract_devices.utils_lib.wlan_utils import setup_ap_and_associate
-from acts_contrib.test_utils.abstract_devices.wlan_device import create_wlan_device
-from acts_contrib.test_utils.fuchsia import utils
-from acts_contrib.test_utils.tel.tel_test_utils import setup_droid_properties
+from acts.test_utils.abstract_devices.utils_lib.wlan_utils import setup_ap_and_associate
+from acts.test_utils.abstract_devices.wlan_device import create_wlan_device
+from acts.test_utils.fuchsia import utils
+from acts.test_utils.tel.tel_test_utils import setup_droid_properties
from acts.utils import rand_ascii_str
diff --git a/acts_tests/tests/google/fuchsia/wlan/PingStressTest.py b/acts_tests/tests/google/fuchsia/wlan/PingStressTest.py
index ef860a9..8577f49 100644
--- a/acts_tests/tests/google/fuchsia/wlan/PingStressTest.py
+++ b/acts_tests/tests/google/fuchsia/wlan/PingStressTest.py
@@ -25,10 +25,10 @@
from acts import signals
from acts.controllers.ap_lib import hostapd_constants
-from acts_contrib.test_utils.abstract_devices.utils_lib.wlan_utils import setup_ap_and_associate
-from acts_contrib.test_utils.abstract_devices.wlan_device import create_wlan_device
-from acts_contrib.test_utils.tel.tel_test_utils import setup_droid_properties
-from acts_contrib.test_utils.fuchsia import utils
+from acts.test_utils.abstract_devices.utils_lib.wlan_utils import setup_ap_and_associate
+from acts.test_utils.abstract_devices.wlan_device import create_wlan_device
+from acts.test_utils.tel.tel_test_utils import setup_droid_properties
+from acts.test_utils.fuchsia import utils
from acts.utils import rand_ascii_str
diff --git a/acts_tests/tests/google/fuchsia/wlan/SoftApTest.py b/acts_tests/tests/google/fuchsia/wlan/SoftApTest.py
index c364481..0f2e697 100644
--- a/acts_tests/tests/google/fuchsia/wlan/SoftApTest.py
+++ b/acts_tests/tests/google/fuchsia/wlan/SoftApTest.py
@@ -26,9 +26,9 @@
from acts.controllers import iperf_client
from acts.controllers.ap_lib import hostapd_constants
from acts.controllers.ap_lib import hostapd_security
-from acts_contrib.test_utils.abstract_devices.utils_lib import wlan_utils
-from acts_contrib.test_utils.abstract_devices.wlan_device import create_wlan_device
-from acts_contrib.test_utils.abstract_devices.utils_lib.wlan_utils import setup_ap
+from acts.test_utils.abstract_devices.utils_lib import wlan_utils
+from acts.test_utils.abstract_devices.wlan_device import create_wlan_device
+from acts.test_utils.abstract_devices.utils_lib.wlan_utils import setup_ap
ANDROID_DEFAULT_WLAN_INTERFACE = 'wlan0'
CONNECTIVITY_MODE_LOCAL = 'local_only'
diff --git a/acts_tests/tests/google/fuchsia/wlan/VapeInteropTest.py b/acts_tests/tests/google/fuchsia/wlan/VapeInteropTest.py
index dd6374d..e9e216c 100644
--- a/acts_tests/tests/google/fuchsia/wlan/VapeInteropTest.py
+++ b/acts_tests/tests/google/fuchsia/wlan/VapeInteropTest.py
@@ -18,10 +18,10 @@
from acts.controllers.ap_lib import hostapd_ap_preset
from acts.controllers.ap_lib import hostapd_constants
from acts.controllers.ap_lib.hostapd_security import Security
-from acts_contrib.test_utils.abstract_devices.wlan_device import create_wlan_device
-from acts_contrib.test_utils.abstract_devices.wlan_device_lib.AbstractDeviceWlanDeviceBaseTest import AbstractDeviceWlanDeviceBaseTest
-from acts_contrib.test_utils.abstract_devices.utils_lib.wlan_utils import validate_setup_ap_and_associate
-from acts_contrib.test_utils.wifi.WifiBaseTest import WifiBaseTest
+from acts.test_utils.abstract_devices.wlan_device import create_wlan_device
+from acts.test_utils.abstract_devices.wlan_device_lib.AbstractDeviceWlanDeviceBaseTest import AbstractDeviceWlanDeviceBaseTest
+from acts.test_utils.abstract_devices.utils_lib.wlan_utils import validate_setup_ap_and_associate
+from acts.test_utils.wifi.WifiBaseTest import WifiBaseTest
class VapeInteropTest(AbstractDeviceWlanDeviceBaseTest):
diff --git a/acts_tests/tests/google/fuchsia/wlan/WlanInterfaceTest.py b/acts_tests/tests/google/fuchsia/wlan/WlanInterfaceTest.py
index 4994dd2..d470bf7 100644
--- a/acts_tests/tests/google/fuchsia/wlan/WlanInterfaceTest.py
+++ b/acts_tests/tests/google/fuchsia/wlan/WlanInterfaceTest.py
@@ -17,8 +17,8 @@
from acts import signals
from acts.base_test import BaseTestClass
-from acts_contrib.test_utils.abstract_devices.wlan_device import create_wlan_device
-from acts_contrib.test_utils.abstract_devices.wlan_device_lib.AbstractDeviceWlanDeviceBaseTest import AbstractDeviceWlanDeviceBaseTest
+from acts.test_utils.abstract_devices.wlan_device import create_wlan_device
+from acts.test_utils.abstract_devices.wlan_device_lib.AbstractDeviceWlanDeviceBaseTest import AbstractDeviceWlanDeviceBaseTest
class WlanInterfaceTest(AbstractDeviceWlanDeviceBaseTest):
diff --git a/acts_tests/tests/google/fuchsia/wlan/WlanPhyCompliance11ACTest.py b/acts_tests/tests/google/fuchsia/wlan/WlanPhyCompliance11ACTest.py
index 72dcfe6..fde4e6d 100644
--- a/acts_tests/tests/google/fuchsia/wlan/WlanPhyCompliance11ACTest.py
+++ b/acts_tests/tests/google/fuchsia/wlan/WlanPhyCompliance11ACTest.py
@@ -21,10 +21,10 @@
from acts.controllers.ap_lib.hostapd_security import Security
from acts.controllers.ap_lib import hostapd_constants
from acts.controllers.ap_lib import hostapd_config
-from acts_contrib.test_utils.abstract_devices.wlan_device import create_wlan_device
-from acts_contrib.test_utils.abstract_devices.wlan_device_lib.AbstractDeviceWlanDeviceBaseTest import AbstractDeviceWlanDeviceBaseTest
-from acts_contrib.test_utils.abstract_devices.utils_lib.wlan_utils import validate_setup_ap_and_associate
-from acts_contrib.test_utils.wifi.WifiBaseTest import WifiBaseTest
+from acts.test_utils.abstract_devices.wlan_device import create_wlan_device
+from acts.test_utils.abstract_devices.wlan_device_lib.AbstractDeviceWlanDeviceBaseTest import AbstractDeviceWlanDeviceBaseTest
+from acts.test_utils.abstract_devices.utils_lib.wlan_utils import validate_setup_ap_and_associate
+from acts.test_utils.wifi.WifiBaseTest import WifiBaseTest
from acts.utils import rand_ascii_str
# AC Capabilities
diff --git a/acts_tests/tests/google/fuchsia/wlan/WlanPhyCompliance11NTest.py b/acts_tests/tests/google/fuchsia/wlan/WlanPhyCompliance11NTest.py
index f538242..f8cc874 100644
--- a/acts_tests/tests/google/fuchsia/wlan/WlanPhyCompliance11NTest.py
+++ b/acts_tests/tests/google/fuchsia/wlan/WlanPhyCompliance11NTest.py
@@ -21,10 +21,10 @@
from acts.controllers.ap_lib.hostapd_security import Security
from acts.controllers.ap_lib import hostapd_constants
from acts.controllers.ap_lib import hostapd_config
-from acts_contrib.test_utils.abstract_devices.wlan_device import create_wlan_device
-from acts_contrib.test_utils.abstract_devices.wlan_device_lib.AbstractDeviceWlanDeviceBaseTest import AbstractDeviceWlanDeviceBaseTest
-from acts_contrib.test_utils.abstract_devices.utils_lib.wlan_utils import validate_setup_ap_and_associate
-from acts_contrib.test_utils.wifi.WifiBaseTest import WifiBaseTest
+from acts.test_utils.abstract_devices.wlan_device import create_wlan_device
+from acts.test_utils.abstract_devices.wlan_device_lib.AbstractDeviceWlanDeviceBaseTest import AbstractDeviceWlanDeviceBaseTest
+from acts.test_utils.abstract_devices.utils_lib.wlan_utils import validate_setup_ap_and_associate
+from acts.test_utils.wifi.WifiBaseTest import WifiBaseTest
from acts.utils import rand_ascii_str
FREQUENCY_24 = ['2.4GHz']
diff --git a/acts_tests/tests/google/fuchsia/wlan/WlanPhyComplianceABGTest.py b/acts_tests/tests/google/fuchsia/wlan/WlanPhyComplianceABGTest.py
index df9931b..8ef8591 100644
--- a/acts_tests/tests/google/fuchsia/wlan/WlanPhyComplianceABGTest.py
+++ b/acts_tests/tests/google/fuchsia/wlan/WlanPhyComplianceABGTest.py
@@ -18,11 +18,11 @@
from acts.controllers.ap_lib import hostapd_ap_preset
from acts.controllers.ap_lib import hostapd_constants
-from acts_contrib.test_utils.abstract_devices.wlan_device import create_wlan_device
-from acts_contrib.test_utils.abstract_devices.wlan_device_lib.AbstractDeviceWlanDeviceBaseTest import AbstractDeviceWlanDeviceBaseTest
-from acts_contrib.test_utils.abstract_devices.utils_lib.wlan_utils import validate_setup_ap_and_associate
-from acts_contrib.test_utils.abstract_devices.utils_lib.wlan_policy_utils import setup_policy_tests, restore_state
-from acts_contrib.test_utils.wifi.WifiBaseTest import WifiBaseTest
+from acts.test_utils.abstract_devices.wlan_device import create_wlan_device
+from acts.test_utils.abstract_devices.wlan_device_lib.AbstractDeviceWlanDeviceBaseTest import AbstractDeviceWlanDeviceBaseTest
+from acts.test_utils.abstract_devices.utils_lib.wlan_utils import validate_setup_ap_and_associate
+from acts.test_utils.abstract_devices.utils_lib.wlan_policy_utils import setup_policy_tests, restore_state
+from acts.test_utils.wifi.WifiBaseTest import WifiBaseTest
class WlanPhyComplianceABGTest(AbstractDeviceWlanDeviceBaseTest):
diff --git a/acts_tests/tests/google/fuchsia/wlan/WlanRebootTest.py b/acts_tests/tests/google/fuchsia/wlan/WlanRebootTest.py
index d880924..7c8bd21 100644
--- a/acts_tests/tests/google/fuchsia/wlan/WlanRebootTest.py
+++ b/acts_tests/tests/google/fuchsia/wlan/WlanRebootTest.py
@@ -30,9 +30,9 @@
from acts.controllers.ap_lib.radvd import Radvd
from acts.controllers.ap_lib import radvd_constants
from acts.controllers.ap_lib.radvd_config import RadvdConfig
-from acts_contrib.test_utils.abstract_devices.wlan_device import create_wlan_device
-from acts_contrib.test_utils.abstract_devices.utils_lib import wlan_utils
-from acts_contrib.test_utils.wifi.WifiBaseTest import WifiBaseTest
+from acts.test_utils.abstract_devices.wlan_device import create_wlan_device
+from acts.test_utils.abstract_devices.utils_lib import wlan_utils
+from acts.test_utils.wifi.WifiBaseTest import WifiBaseTest
# Constants, for readibility
AP = 'ap'
diff --git a/acts_tests/tests/google/fuchsia/wlan/WlanRvrTest.py b/acts_tests/tests/google/fuchsia/wlan/WlanRvrTest.py
index 4eb07fc..87bf1a7 100644
--- a/acts_tests/tests/google/fuchsia/wlan/WlanRvrTest.py
+++ b/acts_tests/tests/google/fuchsia/wlan/WlanRvrTest.py
@@ -24,11 +24,11 @@
from acts.controllers.ap_lib.hostapd_security import Security
from acts.controllers.attenuator import get_attenuators_for_device
from acts.controllers.iperf_server import IPerfResult
-from acts_contrib.test_utils.abstract_devices.utils_lib.wlan_utils import associate
-from acts_contrib.test_utils.abstract_devices.utils_lib.wlan_utils import setup_ap
-from acts_contrib.test_utils.abstract_devices.wlan_device import create_wlan_device
-from acts_contrib.test_utils.abstract_devices.wlan_device_lib.AbstractDeviceWlanDeviceBaseTest import AbstractDeviceWlanDeviceBaseTest
-from acts_contrib.test_utils.wifi.WifiBaseTest import WifiBaseTest
+from acts.test_utils.abstract_devices.utils_lib.wlan_utils import associate
+from acts.test_utils.abstract_devices.utils_lib.wlan_utils import setup_ap
+from acts.test_utils.abstract_devices.wlan_device import create_wlan_device
+from acts.test_utils.abstract_devices.wlan_device_lib.AbstractDeviceWlanDeviceBaseTest import AbstractDeviceWlanDeviceBaseTest
+from acts.test_utils.wifi.WifiBaseTest import WifiBaseTest
from acts.utils import rand_ascii_str
from bokeh.plotting import ColumnDataSource
diff --git a/acts_tests/tests/google/fuchsia/wlan/WlanScanTest.py b/acts_tests/tests/google/fuchsia/wlan/WlanScanTest.py
index eca08cb..012e086 100644
--- a/acts_tests/tests/google/fuchsia/wlan/WlanScanTest.py
+++ b/acts_tests/tests/google/fuchsia/wlan/WlanScanTest.py
@@ -25,14 +25,14 @@
import time
import acts.base_test
-import acts_contrib.test_utils.wifi.wifi_test_utils as wutils
+import acts.test_utils.wifi.wifi_test_utils as wutils
from acts import signals
from acts.controllers.ap_lib import hostapd_ap_preset
from acts.controllers.ap_lib import hostapd_bss_settings
from acts.controllers.ap_lib import hostapd_constants
from acts.controllers.ap_lib import hostapd_security
-from acts_contrib.test_utils.wifi.WifiBaseTest import WifiBaseTest
+from acts.test_utils.wifi.WifiBaseTest import WifiBaseTest
class WlanScanTest(WifiBaseTest):
diff --git a/acts_tests/tests/google/fuchsia/wlan/WlanSecurityComplianceABGTest.py b/acts_tests/tests/google/fuchsia/wlan/WlanSecurityComplianceABGTest.py
index 79878fc..2f43085 100644
--- a/acts_tests/tests/google/fuchsia/wlan/WlanSecurityComplianceABGTest.py
+++ b/acts_tests/tests/google/fuchsia/wlan/WlanSecurityComplianceABGTest.py
@@ -19,11 +19,11 @@
from acts.controllers.ap_lib import hostapd_constants
from acts.controllers.ap_lib.hostapd_security import Security
-from acts_contrib.test_utils.abstract_devices.wlan_device import create_wlan_device
-from acts_contrib.test_utils.abstract_devices.wlan_device_lib.AbstractDeviceWlanDeviceBaseTest import AbstractDeviceWlanDeviceBaseTest
-from acts_contrib.test_utils.abstract_devices.utils_lib.wlan_utils import validate_setup_ap_and_associate
-from acts_contrib.test_utils.abstract_devices.utils_lib.wlan_policy_utils import setup_policy_tests, restore_state
-from acts_contrib.test_utils.wifi.WifiBaseTest import WifiBaseTest
+from acts.test_utils.abstract_devices.wlan_device import create_wlan_device
+from acts.test_utils.abstract_devices.wlan_device_lib.AbstractDeviceWlanDeviceBaseTest import AbstractDeviceWlanDeviceBaseTest
+from acts.test_utils.abstract_devices.utils_lib.wlan_utils import validate_setup_ap_and_associate
+from acts.test_utils.abstract_devices.utils_lib.wlan_policy_utils import setup_policy_tests, restore_state
+from acts.test_utils.wifi.WifiBaseTest import WifiBaseTest
from acts.utils import rand_ascii_str
from acts.utils import rand_hex_str
diff --git a/acts_tests/tests/google/fuchsia/wlan_policy/HiddenNetworksTest.py b/acts_tests/tests/google/fuchsia/wlan_policy/HiddenNetworksTest.py
index ad911ca..670aec0 100644
--- a/acts_tests/tests/google/fuchsia/wlan_policy/HiddenNetworksTest.py
+++ b/acts_tests/tests/google/fuchsia/wlan_policy/HiddenNetworksTest.py
@@ -16,9 +16,9 @@
from acts import signals
from acts.controllers.ap_lib import hostapd_constants
from acts.controllers.ap_lib import hostapd_security
-from acts_contrib.test_utils.abstract_devices.utils_lib.wlan_utils import setup_ap
-from acts_contrib.test_utils.abstract_devices.utils_lib.wlan_policy_utils import reboot_device, restore_state, save_network, setup_policy_tests
-from acts_contrib.test_utils.wifi.WifiBaseTest import WifiBaseTest
+from acts.test_utils.abstract_devices.utils_lib.wlan_utils import setup_ap
+from acts.test_utils.abstract_devices.utils_lib.wlan_policy_utils import reboot_device, restore_state, save_network, setup_policy_tests
+from acts.test_utils.wifi.WifiBaseTest import WifiBaseTest
from acts.utils import rand_ascii_str
import time
diff --git a/acts_tests/tests/google/fuchsia/wlan_policy/PolicyScanTest.py b/acts_tests/tests/google/fuchsia/wlan_policy/PolicyScanTest.py
index beb3fc2..a1c0d7b 100644
--- a/acts_tests/tests/google/fuchsia/wlan_policy/PolicyScanTest.py
+++ b/acts_tests/tests/google/fuchsia/wlan_policy/PolicyScanTest.py
@@ -21,7 +21,7 @@
from acts import signals, utils
from acts.controllers.ap_lib import (hostapd_ap_preset, hostapd_bss_settings,
hostapd_constants, hostapd_security)
-from acts_contrib.test_utils.wifi.WifiBaseTest import WifiBaseTest
+from acts.test_utils.wifi.WifiBaseTest import WifiBaseTest
class PolicyScanTest(WifiBaseTest):
diff --git a/acts_tests/tests/google/fuchsia/wlan_policy/SavedNetworksTest.py b/acts_tests/tests/google/fuchsia/wlan_policy/SavedNetworksTest.py
index 1a8bc42..e16c4f6 100644
--- a/acts_tests/tests/google/fuchsia/wlan_policy/SavedNetworksTest.py
+++ b/acts_tests/tests/google/fuchsia/wlan_policy/SavedNetworksTest.py
@@ -22,9 +22,9 @@
from acts.controllers.ap_lib import hostapd_ap_preset
from acts.controllers.ap_lib import hostapd_constants
from acts.controllers.ap_lib import hostapd_security
-from acts_contrib.test_utils.wifi.WifiBaseTest import WifiBaseTest
-from acts_contrib.test_utils.abstract_devices.utils_lib.wlan_utils import setup_ap
-from acts_contrib.test_utils.abstract_devices.utils_lib.wlan_policy_utils import reboot_device, restore_state, save_network, setup_policy_tests
+from acts.test_utils.wifi.WifiBaseTest import WifiBaseTest
+from acts.test_utils.abstract_devices.utils_lib.wlan_utils import setup_ap
+from acts.test_utils.abstract_devices.utils_lib.wlan_policy_utils import reboot_device, restore_state, save_network, setup_policy_tests
from acts.utils import rand_ascii_str, rand_hex_str, timeout
import requests
import time
diff --git a/acts_tests/tests/google/fuchsia/wlan_policy/StartStopClientConnectionsTest.py b/acts_tests/tests/google/fuchsia/wlan_policy/StartStopClientConnectionsTest.py
index 5ca70f4..7156a80 100644
--- a/acts_tests/tests/google/fuchsia/wlan_policy/StartStopClientConnectionsTest.py
+++ b/acts_tests/tests/google/fuchsia/wlan_policy/StartStopClientConnectionsTest.py
@@ -17,9 +17,9 @@
from acts import signals
from acts.controllers.ap_lib import hostapd_constants
from acts.controllers.ap_lib import hostapd_security
-from acts_contrib.test_utils.abstract_devices.utils_lib.wlan_utils import setup_ap
-from acts_contrib.test_utils.abstract_devices.utils_lib.wlan_policy_utils import setup_policy_tests, restore_state, save_network, start_connections, stop_connections
-from acts_contrib.test_utils.wifi.WifiBaseTest import WifiBaseTest
+from acts.test_utils.abstract_devices.utils_lib.wlan_utils import setup_ap
+from acts.test_utils.abstract_devices.utils_lib.wlan_policy_utils import setup_policy_tests, restore_state, save_network, start_connections, stop_connections
+from acts.test_utils.wifi.WifiBaseTest import WifiBaseTest
from acts.utils import rand_ascii_str
DISCONNECTED = "Disconnected"
diff --git a/acts_tests/tests/google/fugu/AndroidFuguRemotePairingTest.py b/acts_tests/tests/google/fugu/AndroidFuguRemotePairingTest.py
index 78b05d4..a41f9fc 100644
--- a/acts_tests/tests/google/fugu/AndroidFuguRemotePairingTest.py
+++ b/acts_tests/tests/google/fugu/AndroidFuguRemotePairingTest.py
@@ -19,7 +19,7 @@
import time
from acts.controllers.relay_lib.relay import SynchronizeRelays
-from acts_contrib.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
+from acts.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
class AndroidFuguRemotePairingTest(BluetoothBaseTest):
def setup_class(self):
diff --git a/acts_tests/tests/google/gnss/AGNSSPerformanceTest.py b/acts_tests/tests/google/gnss/AGNSSPerformanceTest.py
index 803e735..57d4c35 100644
--- a/acts_tests/tests/google/gnss/AGNSSPerformanceTest.py
+++ b/acts_tests/tests/google/gnss/AGNSSPerformanceTest.py
@@ -19,7 +19,7 @@
from acts import base_test
from acts import asserts
from acts.controllers.rohdeschwarz_lib import contest
-from acts_contrib.test_utils.tel import tel_test_utils
+from acts.test_utils.tel import tel_test_utils
from acts.metrics.loggers import blackbox
import json
diff --git a/acts_tests/tests/google/gnss/FlpTtffTest.py b/acts_tests/tests/google/gnss/FlpTtffTest.py
index 59b19b5..6d73b99 100644
--- a/acts_tests/tests/google/gnss/FlpTtffTest.py
+++ b/acts_tests/tests/google/gnss/FlpTtffTest.py
@@ -20,29 +20,29 @@
from acts.base_test import BaseTestClass
from acts.test_decorators import test_tracker_info
from acts.utils import get_current_epoch_time
-from acts_contrib.test_utils.wifi.wifi_test_utils import wifi_toggle_state
-from acts_contrib.test_utils.tel.tel_test_utils import start_qxdm_logger
-from acts_contrib.test_utils.tel.tel_test_utils import stop_qxdm_logger
-from acts_contrib.test_utils.tel.tel_test_utils import verify_internet_connection
-from acts_contrib.test_utils.tel.tel_test_utils import abort_all_tests
-from acts_contrib.test_utils.gnss.gnss_test_utils import get_baseband_and_gms_version
-from acts_contrib.test_utils.gnss.gnss_test_utils import _init_device
-from acts_contrib.test_utils.gnss.gnss_test_utils import check_location_service
-from acts_contrib.test_utils.gnss.gnss_test_utils import clear_logd_gnss_qxdm_log
-from acts_contrib.test_utils.gnss.gnss_test_utils import set_mobile_data
-from acts_contrib.test_utils.gnss.gnss_test_utils import get_gnss_qxdm_log
-from acts_contrib.test_utils.gnss.gnss_test_utils import set_wifi_and_bt_scanning
-from acts_contrib.test_utils.gnss.gnss_test_utils import process_gnss_by_gtw_gpstool
-from acts_contrib.test_utils.gnss.gnss_test_utils import start_ttff_by_gtw_gpstool
-from acts_contrib.test_utils.gnss.gnss_test_utils import process_ttff_by_gtw_gpstool
-from acts_contrib.test_utils.gnss.gnss_test_utils import check_ttff_data
-from acts_contrib.test_utils.gnss.gnss_test_utils import set_attenuator_gnss_signal
-from acts_contrib.test_utils.gnss.gnss_test_utils import connect_to_wifi_network
-from acts_contrib.test_utils.gnss.gnss_test_utils import gnss_tracking_via_gtw_gpstool
-from acts_contrib.test_utils.gnss.gnss_test_utils import parse_gtw_gpstool_log
-from acts_contrib.test_utils.tel.tel_test_utils import start_adb_tcpdump
-from acts_contrib.test_utils.tel.tel_test_utils import stop_adb_tcpdump
-from acts_contrib.test_utils.tel.tel_test_utils import get_tcpdump_log
+from acts.test_utils.wifi.wifi_test_utils import wifi_toggle_state
+from acts.test_utils.tel.tel_test_utils import start_qxdm_logger
+from acts.test_utils.tel.tel_test_utils import stop_qxdm_logger
+from acts.test_utils.tel.tel_test_utils import verify_internet_connection
+from acts.test_utils.tel.tel_test_utils import abort_all_tests
+from acts.test_utils.gnss.gnss_test_utils import get_baseband_and_gms_version
+from acts.test_utils.gnss.gnss_test_utils import _init_device
+from acts.test_utils.gnss.gnss_test_utils import check_location_service
+from acts.test_utils.gnss.gnss_test_utils import clear_logd_gnss_qxdm_log
+from acts.test_utils.gnss.gnss_test_utils import set_mobile_data
+from acts.test_utils.gnss.gnss_test_utils import get_gnss_qxdm_log
+from acts.test_utils.gnss.gnss_test_utils import set_wifi_and_bt_scanning
+from acts.test_utils.gnss.gnss_test_utils import process_gnss_by_gtw_gpstool
+from acts.test_utils.gnss.gnss_test_utils import start_ttff_by_gtw_gpstool
+from acts.test_utils.gnss.gnss_test_utils import process_ttff_by_gtw_gpstool
+from acts.test_utils.gnss.gnss_test_utils import check_ttff_data
+from acts.test_utils.gnss.gnss_test_utils import set_attenuator_gnss_signal
+from acts.test_utils.gnss.gnss_test_utils import connect_to_wifi_network
+from acts.test_utils.gnss.gnss_test_utils import gnss_tracking_via_gtw_gpstool
+from acts.test_utils.gnss.gnss_test_utils import parse_gtw_gpstool_log
+from acts.test_utils.tel.tel_test_utils import start_adb_tcpdump
+from acts.test_utils.tel.tel_test_utils import stop_adb_tcpdump
+from acts.test_utils.tel.tel_test_utils import get_tcpdump_log
class FlpTtffTest(BaseTestClass):
diff --git a/acts_tests/tests/google/gnss/GnssFunctionTest.py b/acts_tests/tests/google/gnss/GnssFunctionTest.py
index 7bc8f44..b1de836 100644
--- a/acts_tests/tests/google/gnss/GnssFunctionTest.py
+++ b/acts_tests/tests/google/gnss/GnssFunctionTest.py
@@ -24,58 +24,58 @@
from acts import signals
from acts.base_test import BaseTestClass
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.wifi import wifi_test_utils as wutils
-from acts_contrib.test_utils.tel import tel_test_utils as tutils
-from acts_contrib.test_utils.gnss import gnss_test_utils as gutils
+from acts.test_utils.wifi import wifi_test_utils as wutils
+from acts.test_utils.tel import tel_test_utils as tutils
+from acts.test_utils.gnss import gnss_test_utils as gutils
from acts.utils import get_current_epoch_time
from acts.utils import unzip_maintain_permissions
from acts.utils import force_airplane_mode
-from acts_contrib.test_utils.wifi.wifi_test_utils import wifi_toggle_state
-from acts_contrib.test_utils.tel.tel_test_utils import flash_radio
-from acts_contrib.test_utils.tel.tel_test_utils import verify_internet_connection
-from acts_contrib.test_utils.tel.tel_test_utils import abort_all_tests
-from acts_contrib.test_utils.tel.tel_test_utils import stop_qxdm_logger
-from acts_contrib.test_utils.tel.tel_test_utils import check_call_state_connected_by_adb
-from acts_contrib.test_utils.tel.tel_test_utils import initiate_call
-from acts_contrib.test_utils.tel.tel_test_utils import hangup_call
-from acts_contrib.test_utils.tel.tel_test_utils import http_file_download_by_sl4a
-from acts_contrib.test_utils.tel.tel_test_utils import start_qxdm_logger
-from acts_contrib.test_utils.tel.tel_test_utils import trigger_modem_crash
-from acts_contrib.test_utils.gnss.gnss_test_utils import get_baseband_and_gms_version
-from acts_contrib.test_utils.gnss.gnss_test_utils import set_attenuator_gnss_signal
-from acts_contrib.test_utils.gnss.gnss_test_utils import _init_device
-from acts_contrib.test_utils.gnss.gnss_test_utils import check_location_service
-from acts_contrib.test_utils.gnss.gnss_test_utils import clear_logd_gnss_qxdm_log
-from acts_contrib.test_utils.gnss.gnss_test_utils import set_mobile_data
-from acts_contrib.test_utils.gnss.gnss_test_utils import set_wifi_and_bt_scanning
-from acts_contrib.test_utils.gnss.gnss_test_utils import get_gnss_qxdm_log
-from acts_contrib.test_utils.gnss.gnss_test_utils import remount_device
-from acts_contrib.test_utils.gnss.gnss_test_utils import reboot
-from acts_contrib.test_utils.gnss.gnss_test_utils import check_network_location
-from acts_contrib.test_utils.gnss.gnss_test_utils import launch_google_map
-from acts_contrib.test_utils.gnss.gnss_test_utils import check_location_api
-from acts_contrib.test_utils.gnss.gnss_test_utils import set_battery_saver_mode
-from acts_contrib.test_utils.gnss.gnss_test_utils import kill_xtra_daemon
-from acts_contrib.test_utils.gnss.gnss_test_utils import start_gnss_by_gtw_gpstool
-from acts_contrib.test_utils.gnss.gnss_test_utils import process_gnss_by_gtw_gpstool
-from acts_contrib.test_utils.gnss.gnss_test_utils import start_ttff_by_gtw_gpstool
-from acts_contrib.test_utils.gnss.gnss_test_utils import process_ttff_by_gtw_gpstool
-from acts_contrib.test_utils.gnss.gnss_test_utils import check_ttff_data
-from acts_contrib.test_utils.gnss.gnss_test_utils import start_youtube_video
-from acts_contrib.test_utils.gnss.gnss_test_utils import fastboot_factory_reset
-from acts_contrib.test_utils.gnss.gnss_test_utils import gnss_trigger_modem_ssr_by_adb
-from acts_contrib.test_utils.gnss.gnss_test_utils import gnss_trigger_modem_ssr_by_mds
-from acts_contrib.test_utils.gnss.gnss_test_utils import disable_supl_mode
-from acts_contrib.test_utils.gnss.gnss_test_utils import connect_to_wifi_network
-from acts_contrib.test_utils.gnss.gnss_test_utils import check_xtra_download
-from acts_contrib.test_utils.gnss.gnss_test_utils import gnss_tracking_via_gtw_gpstool
-from acts_contrib.test_utils.gnss.gnss_test_utils import parse_gtw_gpstool_log
-from acts_contrib.test_utils.gnss.gnss_test_utils import enable_supl_mode
-from acts_contrib.test_utils.gnss.gnss_test_utils import start_toggle_gnss_by_gtw_gpstool
-from acts_contrib.test_utils.gnss.gnss_test_utils import grant_location_permission
-from acts_contrib.test_utils.tel.tel_test_utils import start_adb_tcpdump
-from acts_contrib.test_utils.tel.tel_test_utils import stop_adb_tcpdump
-from acts_contrib.test_utils.tel.tel_test_utils import get_tcpdump_log
+from acts.test_utils.wifi.wifi_test_utils import wifi_toggle_state
+from acts.test_utils.tel.tel_test_utils import flash_radio
+from acts.test_utils.tel.tel_test_utils import verify_internet_connection
+from acts.test_utils.tel.tel_test_utils import abort_all_tests
+from acts.test_utils.tel.tel_test_utils import stop_qxdm_logger
+from acts.test_utils.tel.tel_test_utils import check_call_state_connected_by_adb
+from acts.test_utils.tel.tel_test_utils import initiate_call
+from acts.test_utils.tel.tel_test_utils import hangup_call
+from acts.test_utils.tel.tel_test_utils import http_file_download_by_sl4a
+from acts.test_utils.tel.tel_test_utils import start_qxdm_logger
+from acts.test_utils.tel.tel_test_utils import trigger_modem_crash
+from acts.test_utils.gnss.gnss_test_utils import get_baseband_and_gms_version
+from acts.test_utils.gnss.gnss_test_utils import set_attenuator_gnss_signal
+from acts.test_utils.gnss.gnss_test_utils import _init_device
+from acts.test_utils.gnss.gnss_test_utils import check_location_service
+from acts.test_utils.gnss.gnss_test_utils import clear_logd_gnss_qxdm_log
+from acts.test_utils.gnss.gnss_test_utils import set_mobile_data
+from acts.test_utils.gnss.gnss_test_utils import set_wifi_and_bt_scanning
+from acts.test_utils.gnss.gnss_test_utils import get_gnss_qxdm_log
+from acts.test_utils.gnss.gnss_test_utils import remount_device
+from acts.test_utils.gnss.gnss_test_utils import reboot
+from acts.test_utils.gnss.gnss_test_utils import check_network_location
+from acts.test_utils.gnss.gnss_test_utils import launch_google_map
+from acts.test_utils.gnss.gnss_test_utils import check_location_api
+from acts.test_utils.gnss.gnss_test_utils import set_battery_saver_mode
+from acts.test_utils.gnss.gnss_test_utils import kill_xtra_daemon
+from acts.test_utils.gnss.gnss_test_utils import start_gnss_by_gtw_gpstool
+from acts.test_utils.gnss.gnss_test_utils import process_gnss_by_gtw_gpstool
+from acts.test_utils.gnss.gnss_test_utils import start_ttff_by_gtw_gpstool
+from acts.test_utils.gnss.gnss_test_utils import process_ttff_by_gtw_gpstool
+from acts.test_utils.gnss.gnss_test_utils import check_ttff_data
+from acts.test_utils.gnss.gnss_test_utils import start_youtube_video
+from acts.test_utils.gnss.gnss_test_utils import fastboot_factory_reset
+from acts.test_utils.gnss.gnss_test_utils import gnss_trigger_modem_ssr_by_adb
+from acts.test_utils.gnss.gnss_test_utils import gnss_trigger_modem_ssr_by_mds
+from acts.test_utils.gnss.gnss_test_utils import disable_supl_mode
+from acts.test_utils.gnss.gnss_test_utils import connect_to_wifi_network
+from acts.test_utils.gnss.gnss_test_utils import check_xtra_download
+from acts.test_utils.gnss.gnss_test_utils import gnss_tracking_via_gtw_gpstool
+from acts.test_utils.gnss.gnss_test_utils import parse_gtw_gpstool_log
+from acts.test_utils.gnss.gnss_test_utils import enable_supl_mode
+from acts.test_utils.gnss.gnss_test_utils import start_toggle_gnss_by_gtw_gpstool
+from acts.test_utils.gnss.gnss_test_utils import grant_location_permission
+from acts.test_utils.tel.tel_test_utils import start_adb_tcpdump
+from acts.test_utils.tel.tel_test_utils import stop_adb_tcpdump
+from acts.test_utils.tel.tel_test_utils import get_tcpdump_log
class GnssFunctionTest(BaseTestClass):
diff --git a/acts_tests/tests/google/gnss/GnssPowerAGPSTest.py b/acts_tests/tests/google/gnss/GnssPowerAGPSTest.py
index e0f70a5..f5a3dcc 100644
--- a/acts_tests/tests/google/gnss/GnssPowerAGPSTest.py
+++ b/acts_tests/tests/google/gnss/GnssPowerAGPSTest.py
@@ -15,9 +15,9 @@
# limitations under the License.
from acts import utils
-from acts_contrib.test_utils.power.PowerGTWGnssBaseTest import PowerGTWGnssBaseTest
-from acts_contrib.test_utils.gnss import gnss_test_utils as gutils
-from acts_contrib.test_utils.wifi import wifi_test_utils as wutils
+from acts.test_utils.power.PowerGTWGnssBaseTest import PowerGTWGnssBaseTest
+from acts.test_utils.gnss import gnss_test_utils as gutils
+from acts.test_utils.wifi import wifi_test_utils as wutils
class GnssPowerAGPSTest(PowerGTWGnssBaseTest):
diff --git a/acts_tests/tests/google/gnss/GnssPowerBasicTest.py b/acts_tests/tests/google/gnss/GnssPowerBasicTest.py
index cd60c48..a6c0066 100644
--- a/acts_tests/tests/google/gnss/GnssPowerBasicTest.py
+++ b/acts_tests/tests/google/gnss/GnssPowerBasicTest.py
@@ -15,9 +15,9 @@
# limitations under the License.
from acts import utils
-from acts_contrib.test_utils.power.PowerGTWGnssBaseTest import PowerGTWGnssBaseTest
-from acts_contrib.test_utils.gnss import gnss_test_utils as gutils
-from acts_contrib.test_utils.wifi import wifi_test_utils as wutils
+from acts.test_utils.power.PowerGTWGnssBaseTest import PowerGTWGnssBaseTest
+from acts.test_utils.gnss import gnss_test_utils as gutils
+from acts.test_utils.wifi import wifi_test_utils as wutils
class GnssPowerBasicTest(PowerGTWGnssBaseTest):
diff --git a/acts_tests/tests/google/gnss/GnssPowerLongIntervalTest.py b/acts_tests/tests/google/gnss/GnssPowerLongIntervalTest.py
index ec4733f..100b6bf 100644
--- a/acts_tests/tests/google/gnss/GnssPowerLongIntervalTest.py
+++ b/acts_tests/tests/google/gnss/GnssPowerLongIntervalTest.py
@@ -15,9 +15,9 @@
# limitations under the License.
from acts import utils
-from acts_contrib.test_utils.power.PowerGTWGnssBaseTest import PowerGTWGnssBaseTest
-from acts_contrib.test_utils.gnss import gnss_test_utils as gutils
-from acts_contrib.test_utils.wifi import wifi_test_utils as wutils
+from acts.test_utils.power.PowerGTWGnssBaseTest import PowerGTWGnssBaseTest
+from acts.test_utils.gnss import gnss_test_utils as gutils
+from acts.test_utils.wifi import wifi_test_utils as wutils
class GnssPowerLongIntervalTest(PowerGTWGnssBaseTest):
diff --git a/acts_tests/tests/google/gnss/GnssPowerLowPowerTest.py b/acts_tests/tests/google/gnss/GnssPowerLowPowerTest.py
index 8a2b99d..4e64be2 100644
--- a/acts_tests/tests/google/gnss/GnssPowerLowPowerTest.py
+++ b/acts_tests/tests/google/gnss/GnssPowerLowPowerTest.py
@@ -15,9 +15,9 @@
# limitations under the License.
from acts import utils
-from acts_contrib.test_utils.power.PowerGTWGnssBaseTest import PowerGTWGnssBaseTest
-from acts_contrib.test_utils.gnss import gnss_test_utils as gutils
-from acts_contrib.test_utils.wifi import wifi_test_utils as wutils
+from acts.test_utils.power.PowerGTWGnssBaseTest import PowerGTWGnssBaseTest
+from acts.test_utils.gnss import gnss_test_utils as gutils
+from acts.test_utils.wifi import wifi_test_utils as wutils
class GnssPowerLowPowerTest(PowerGTWGnssBaseTest):
diff --git a/acts_tests/tests/google/gnss/GnssSimInventoryTest.py b/acts_tests/tests/google/gnss/GnssSimInventoryTest.py
index cabd82d..8844cbc 100644
--- a/acts_tests/tests/google/gnss/GnssSimInventoryTest.py
+++ b/acts_tests/tests/google/gnss/GnssSimInventoryTest.py
@@ -5,9 +5,9 @@
from acts import utils
from acts import signals
from acts.base_test import BaseTestClass
-from acts_contrib.test_utils.tel.tel_defines import EventSmsSentSuccess
-from acts_contrib.test_utils.tel.tel_test_utils import get_iccid_by_adb
-from acts_contrib.test_utils.tel.tel_test_utils import is_sim_ready_by_adb
+from acts.test_utils.tel.tel_defines import EventSmsSentSuccess
+from acts.test_utils.tel.tel_test_utils import get_iccid_by_adb
+from acts.test_utils.tel.tel_test_utils import is_sim_ready_by_adb
class GnssSimInventoryTest(BaseTestClass):
diff --git a/acts_tests/tests/google/gnss/LabTtffTest.py b/acts_tests/tests/google/gnss/LabTtffTest.py
index 3eaa053..59e525c 100644
--- a/acts_tests/tests/google/gnss/LabTtffTest.py
+++ b/acts_tests/tests/google/gnss/LabTtffTest.py
@@ -26,8 +26,8 @@
from pandas import DataFrame
from collections import namedtuple
from acts.controllers.spectracom_lib import gsg6
-from acts_contrib.test_utils.gnss import gnss_test_utils as gutils
-from acts_contrib.test_utils.gnss import gnss_testlog_utils as glogutils
+from acts.test_utils.gnss import gnss_test_utils as gutils
+from acts.test_utils.gnss import gnss_testlog_utils as glogutils
DEVICE_GPSLOG_FOLDER = '/sdcard/Android/data/com.android.gpstool/files/'
GPS_PKG_NAME = 'com.android.gpstool'
diff --git a/acts_tests/tests/google/gnss/LocationPlatinumTest.py b/acts_tests/tests/google/gnss/LocationPlatinumTest.py
index 110748f..73b628f 100644
--- a/acts_tests/tests/google/gnss/LocationPlatinumTest.py
+++ b/acts_tests/tests/google/gnss/LocationPlatinumTest.py
@@ -20,9 +20,9 @@
from acts import signals
from acts import utils
from acts.base_test import BaseTestClass
-from acts_contrib.test_utils.gnss import gnss_test_utils as gutils
-from acts_contrib.test_utils.wifi import wifi_test_utils as wutils
-from acts_contrib.test_utils.tel import tel_test_utils as tutils
+from acts.test_utils.gnss import gnss_test_utils as gutils
+from acts.test_utils.wifi import wifi_test_utils as wutils
+from acts.test_utils.tel import tel_test_utils as tutils
BACKGROUND_LOCATION_PERMISSION = 'android.permission.ACCESS_BACKGROUND_LOCATION'
APP_CLEAN_UP_TIME = 60
diff --git a/acts_tests/tests/google/instrumentation/power/apollo/ApolloIdleTest.py b/acts_tests/tests/google/instrumentation/power/apollo/ApolloIdleTest.py
index 7ea2635..6a37b84 100644
--- a/acts_tests/tests/google/instrumentation/power/apollo/ApolloIdleTest.py
+++ b/acts_tests/tests/google/instrumentation/power/apollo/ApolloIdleTest.py
@@ -1,4 +1,4 @@
-from acts_contrib.test_utils.instrumentation.power.apollo.ApolloBaseTest import ApolloBaseTest
+from acts.test_utils.instrumentation.power.apollo.ApolloBaseTest import ApolloBaseTest
class ApolloIdleTest(ApolloBaseTest):
diff --git a/acts_tests/tests/google/instrumentation/power/apollo/ApolloNoSetupTest.py b/acts_tests/tests/google/instrumentation/power/apollo/ApolloNoSetupTest.py
index ae93451..194869a 100644
--- a/acts_tests/tests/google/instrumentation/power/apollo/ApolloNoSetupTest.py
+++ b/acts_tests/tests/google/instrumentation/power/apollo/ApolloNoSetupTest.py
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-from acts_contrib.test_utils.instrumentation.power import instrumentation_power_test
+from acts.test_utils.instrumentation.power import instrumentation_power_test
class ApolloNoSetupTest(instrumentation_power_test.InstrumentationPowerTest):
diff --git a/acts_tests/tests/google/instrumentation/power/apps/ChromeTest.py b/acts_tests/tests/google/instrumentation/power/apps/ChromeTest.py
index 69d6383..2e59650 100644
--- a/acts_tests/tests/google/instrumentation/power/apps/ChromeTest.py
+++ b/acts_tests/tests/google/instrumentation/power/apps/ChromeTest.py
@@ -14,10 +14,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-from acts_contrib.test_utils.instrumentation.device.apps.dismiss_dialogs import \
+from acts.test_utils.instrumentation.device.apps.dismiss_dialogs import \
DialogDismissalUtil
-from acts_contrib.test_utils.instrumentation.power import instrumentation_power_test
-from acts_contrib.test_utils.instrumentation.device.command.adb_commands import common
+from acts.test_utils.instrumentation.power import instrumentation_power_test
+from acts.test_utils.instrumentation.device.command.adb_commands import common
BIG_FILE_PUSH_TIMEOUT = 600
diff --git a/acts_tests/tests/google/instrumentation/power/apps/DuoTest.py b/acts_tests/tests/google/instrumentation/power/apps/DuoTest.py
index 39d064c..9e9ac6e 100644
--- a/acts_tests/tests/google/instrumentation/power/apps/DuoTest.py
+++ b/acts_tests/tests/google/instrumentation/power/apps/DuoTest.py
@@ -15,10 +15,10 @@
# limitations under the License.
-from acts_contrib.test_utils.instrumentation.power import instrumentation_power_test
-from acts_contrib.test_utils.instrumentation.device.apps.app_installer import \
+from acts.test_utils.instrumentation.power import instrumentation_power_test
+from acts.test_utils.instrumentation.device.apps.app_installer import \
AppInstaller
-from acts_contrib.test_utils.instrumentation.device.command.adb_commands import goog
+from acts.test_utils.instrumentation.device.command.adb_commands import goog
class DuoTest(instrumentation_power_test.InstrumentationPowerTest):
diff --git a/acts_tests/tests/google/instrumentation/power/apps/FlightSimulatorTest.py b/acts_tests/tests/google/instrumentation/power/apps/FlightSimulatorTest.py
index 72291be..4991dca 100644
--- a/acts_tests/tests/google/instrumentation/power/apps/FlightSimulatorTest.py
+++ b/acts_tests/tests/google/instrumentation/power/apps/FlightSimulatorTest.py
@@ -15,8 +15,8 @@
# limitations under the License.
-from acts_contrib.test_utils.instrumentation.power import instrumentation_power_test
-from acts_contrib.test_utils.instrumentation.device.apps.app_installer import \
+from acts.test_utils.instrumentation.power import instrumentation_power_test
+from acts.test_utils.instrumentation.device.apps.app_installer import \
AppInstaller
diff --git a/acts_tests/tests/google/instrumentation/power/apps/LauncherTest.py b/acts_tests/tests/google/instrumentation/power/apps/LauncherTest.py
index d8a7c80..169d276 100644
--- a/acts_tests/tests/google/instrumentation/power/apps/LauncherTest.py
+++ b/acts_tests/tests/google/instrumentation/power/apps/LauncherTest.py
@@ -15,7 +15,7 @@
# limitations under the License.
-from acts_contrib.test_utils.instrumentation.power import instrumentation_power_test
+from acts.test_utils.instrumentation.power import instrumentation_power_test
class LauncherTest(instrumentation_power_test.InstrumentationPowerTest):
"""Test class for running app launcher test cases."""
diff --git a/acts_tests/tests/google/instrumentation/power/apps/WallpaperTest.py b/acts_tests/tests/google/instrumentation/power/apps/WallpaperTest.py
index 28d398a..304f5d3 100644
--- a/acts_tests/tests/google/instrumentation/power/apps/WallpaperTest.py
+++ b/acts_tests/tests/google/instrumentation/power/apps/WallpaperTest.py
@@ -15,7 +15,7 @@
# limitations under the License.
-from acts_contrib.test_utils.instrumentation.power import instrumentation_power_test
+from acts.test_utils.instrumentation.power import instrumentation_power_test
SMALL_FILE_PUSH_TIMEOUT = 10
diff --git a/acts_tests/tests/google/instrumentation/power/camera/ImageCaptureTest.py b/acts_tests/tests/google/instrumentation/power/camera/ImageCaptureTest.py
index b3ab8a1..cbd025e 100644
--- a/acts_tests/tests/google/instrumentation/power/camera/ImageCaptureTest.py
+++ b/acts_tests/tests/google/instrumentation/power/camera/ImageCaptureTest.py
@@ -14,8 +14,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-from acts_contrib.test_utils.instrumentation.power import instrumentation_power_test
-from acts_contrib.test_utils.instrumentation.device.apps.dismiss_dialogs import \
+from acts.test_utils.instrumentation.power import instrumentation_power_test
+from acts.test_utils.instrumentation.device.apps.dismiss_dialogs import \
DialogDismissalUtil
diff --git a/acts_tests/tests/google/instrumentation/power/chre/ChrePowerTest.py b/acts_tests/tests/google/instrumentation/power/chre/ChrePowerTest.py
index dd38663..61c9e64 100644
--- a/acts_tests/tests/google/instrumentation/power/chre/ChrePowerTest.py
+++ b/acts_tests/tests/google/instrumentation/power/chre/ChrePowerTest.py
@@ -14,9 +14,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-from acts_contrib.test_utils.instrumentation.device.command.adb_commands import common
-from acts_contrib.test_utils.instrumentation.device.command.adb_commands import goog
-from acts_contrib.test_utils.instrumentation.power import instrumentation_power_test
+from acts.test_utils.instrumentation.device.command.adb_commands import common
+from acts.test_utils.instrumentation.device.command.adb_commands import goog
+from acts.test_utils.instrumentation.power import instrumentation_power_test
BIG_FILE_PUSH_TIMEOUT = 600
diff --git a/acts_tests/tests/google/instrumentation/power/comms/bluetooth/BluetoothEnableTest.py b/acts_tests/tests/google/instrumentation/power/comms/bluetooth/BluetoothEnableTest.py
index 581b903..502ba8c 100644
--- a/acts_tests/tests/google/instrumentation/power/comms/bluetooth/BluetoothEnableTest.py
+++ b/acts_tests/tests/google/instrumentation/power/comms/bluetooth/BluetoothEnableTest.py
@@ -14,8 +14,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-from acts_contrib.test_utils.instrumentation.power import instrumentation_power_test
-from acts_contrib.test_utils.instrumentation.device.command.adb_commands import common
+from acts.test_utils.instrumentation.power import instrumentation_power_test
+from acts.test_utils.instrumentation.device.command.adb_commands import common
class BluetoothEnableTest(instrumentation_power_test.InstrumentationPowerTest):
diff --git a/acts_tests/tests/google/instrumentation/power/comms/telephony/LteTest.py b/acts_tests/tests/google/instrumentation/power/comms/telephony/LteTest.py
index 7f3b245..0022fee 100644
--- a/acts_tests/tests/google/instrumentation/power/comms/telephony/LteTest.py
+++ b/acts_tests/tests/google/instrumentation/power/comms/telephony/LteTest.py
@@ -15,9 +15,9 @@
# limitations under the License.
import time
-from acts_contrib.test_utils.instrumentation.power.instrumentation_power_test \
+from acts.test_utils.instrumentation.power.instrumentation_power_test \
import InstrumentationPowerTest
-from acts_contrib.test_utils.instrumentation.device.command.adb_commands import common
+from acts.test_utils.instrumentation.device.command.adb_commands import common
from acts import signals
from acts.libs.proc.job import TimeoutError
diff --git a/acts_tests/tests/google/instrumentation/power/comms/telephony/ThreeGVoiceCallTest.py b/acts_tests/tests/google/instrumentation/power/comms/telephony/ThreeGVoiceCallTest.py
index 7252a14..18af944 100644
--- a/acts_tests/tests/google/instrumentation/power/comms/telephony/ThreeGVoiceCallTest.py
+++ b/acts_tests/tests/google/instrumentation/power/comms/telephony/ThreeGVoiceCallTest.py
@@ -14,9 +14,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-from acts_contrib.test_utils.instrumentation.power.instrumentation_power_test \
+from acts.test_utils.instrumentation.power.instrumentation_power_test \
import InstrumentationPowerTest
-from acts_contrib.test_utils.instrumentation.device.command.adb_commands import common
+from acts.test_utils.instrumentation.device.command.adb_commands import common
class ThreeGVoiceCallTest(InstrumentationPowerTest):
diff --git a/acts_tests/tests/google/instrumentation/power/idle/IdleTest.py b/acts_tests/tests/google/instrumentation/power/idle/IdleTest.py
index 8ea1926..90427ca 100644
--- a/acts_tests/tests/google/instrumentation/power/idle/IdleTest.py
+++ b/acts_tests/tests/google/instrumentation/power/idle/IdleTest.py
@@ -19,9 +19,9 @@
from acts import signals
from acts.libs.proc.job import TimeoutError
from acts.controllers.android_lib.errors import AndroidDeviceError
-from acts_contrib.test_utils.instrumentation.power import instrumentation_power_test
-from acts_contrib.test_utils.instrumentation.device.command.adb_commands import common
-from acts_contrib.test_utils.instrumentation.device.command.adb_commands import goog
+from acts.test_utils.instrumentation.power import instrumentation_power_test
+from acts.test_utils.instrumentation.device.command.adb_commands import common
+from acts.test_utils.instrumentation.device.command.adb_commands import goog
class IdleTest(instrumentation_power_test.InstrumentationPowerTest):
diff --git a/acts_tests/tests/google/instrumentation/power/idle/PartialWakeLockTest.py b/acts_tests/tests/google/instrumentation/power/idle/PartialWakeLockTest.py
index 4c0bb3b..35d3d12 100644
--- a/acts_tests/tests/google/instrumentation/power/idle/PartialWakeLockTest.py
+++ b/acts_tests/tests/google/instrumentation/power/idle/PartialWakeLockTest.py
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-from acts_contrib.test_utils.instrumentation.power import instrumentation_power_test
+from acts.test_utils.instrumentation.power import instrumentation_power_test
class PartialWakeLockTest(instrumentation_power_test.InstrumentationPowerTest):
diff --git a/acts_tests/tests/google/instrumentation/power/idle/PowerPresubmitTest.py b/acts_tests/tests/google/instrumentation/power/idle/PowerPresubmitTest.py
index ae5808b..acb3a46 100644
--- a/acts_tests/tests/google/instrumentation/power/idle/PowerPresubmitTest.py
+++ b/acts_tests/tests/google/instrumentation/power/idle/PowerPresubmitTest.py
@@ -14,8 +14,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-from acts_contrib.test_utils.instrumentation import config_wrapper
-from acts_contrib.test_utils.instrumentation.power import instrumentation_power_test
+from acts.test_utils.instrumentation import config_wrapper
+from acts.test_utils.instrumentation.power import instrumentation_power_test
class PowerPresubmitTest(instrumentation_power_test.InstrumentationPowerTest):
diff --git a/acts_tests/tests/google/instrumentation/power/media/LocalMusicPlaybackTest.py b/acts_tests/tests/google/instrumentation/power/media/LocalMusicPlaybackTest.py
index f93f467..5dbc215 100644
--- a/acts_tests/tests/google/instrumentation/power/media/LocalMusicPlaybackTest.py
+++ b/acts_tests/tests/google/instrumentation/power/media/LocalMusicPlaybackTest.py
@@ -14,10 +14,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-from acts_contrib.test_utils.instrumentation.device.apps.dismiss_dialogs import \
+from acts.test_utils.instrumentation.device.apps.dismiss_dialogs import \
DialogDismissalUtil
-from acts_contrib.test_utils.instrumentation.device.command.adb_commands import common
-from acts_contrib.test_utils.instrumentation.power import instrumentation_power_test
+from acts.test_utils.instrumentation.device.command.adb_commands import common
+from acts.test_utils.instrumentation.power import instrumentation_power_test
BIG_FILE_PUSH_TIMEOUT = 600
diff --git a/acts_tests/tests/google/instrumentation/power/media/LocalYoutubeMusicPlaybackTest.py b/acts_tests/tests/google/instrumentation/power/media/LocalYoutubeMusicPlaybackTest.py
index 5762e55..d0dd746 100644
--- a/acts_tests/tests/google/instrumentation/power/media/LocalYoutubeMusicPlaybackTest.py
+++ b/acts_tests/tests/google/instrumentation/power/media/LocalYoutubeMusicPlaybackTest.py
@@ -14,10 +14,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-from acts_contrib.test_utils.instrumentation.device.apps.dismiss_dialogs import \
+from acts.test_utils.instrumentation.device.apps.dismiss_dialogs import \
DialogDismissalUtil
-from acts_contrib.test_utils.instrumentation.device.command.adb_commands import common
-from acts_contrib.test_utils.instrumentation.power import instrumentation_power_test
+from acts.test_utils.instrumentation.device.command.adb_commands import common
+from acts.test_utils.instrumentation.power import instrumentation_power_test
from acts import signals
from acts.controllers.android_lib.errors import AndroidDeviceError
diff --git a/acts_tests/tests/google/instrumentation/power/media/VideoPlaybackTest.py b/acts_tests/tests/google/instrumentation/power/media/VideoPlaybackTest.py
index 7eb6bbf..7981bb4 100644
--- a/acts_tests/tests/google/instrumentation/power/media/VideoPlaybackTest.py
+++ b/acts_tests/tests/google/instrumentation/power/media/VideoPlaybackTest.py
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-from acts_contrib.test_utils.instrumentation.power import instrumentation_power_test
+from acts.test_utils.instrumentation.power import instrumentation_power_test
BIG_FILE_PUSH_TIMEOUT = 600
diff --git a/acts_tests/tests/google/instrumentation/power/vzw_dou_automation/VzWDoUAutomationBrowserTest.py b/acts_tests/tests/google/instrumentation/power/vzw_dou_automation/VzWDoUAutomationBrowserTest.py
index 6c84eab..41a3d20 100644
--- a/acts_tests/tests/google/instrumentation/power/vzw_dou_automation/VzWDoUAutomationBrowserTest.py
+++ b/acts_tests/tests/google/instrumentation/power/vzw_dou_automation/VzWDoUAutomationBrowserTest.py
@@ -15,10 +15,10 @@
# limitations under the License.
from acts.test_decorators import repeated_test
-from acts_contrib.test_utils.instrumentation.power.vzw_dou_automation import \
+from acts.test_utils.instrumentation.power.vzw_dou_automation import \
vzw_dou_automation_base_test
-from acts_contrib.test_utils.instrumentation.device.command.adb_commands import goog
-from acts_contrib.test_utils.instrumentation.device.command.adb_commands import common
+from acts.test_utils.instrumentation.device.command.adb_commands import goog
+from acts.test_utils.instrumentation.device.command.adb_commands import common
class VzWDoUAutomationBrowserTest(
diff --git a/acts_tests/tests/google/instrumentation/power/vzw_dou_automation/VzWDoUAutomationEmailTest.py b/acts_tests/tests/google/instrumentation/power/vzw_dou_automation/VzWDoUAutomationEmailTest.py
index 83feefd..6161cf7 100644
--- a/acts_tests/tests/google/instrumentation/power/vzw_dou_automation/VzWDoUAutomationEmailTest.py
+++ b/acts_tests/tests/google/instrumentation/power/vzw_dou_automation/VzWDoUAutomationEmailTest.py
@@ -15,7 +15,7 @@
# limitations under the License.
from acts.test_decorators import repeated_test
-from acts_contrib.test_utils.instrumentation.power.vzw_dou_automation import \
+from acts.test_utils.instrumentation.power.vzw_dou_automation import \
vzw_dou_automation_base_test
diff --git a/acts_tests/tests/google/instrumentation/power/vzw_dou_automation/VzWDoUAutomationIdleTest.py b/acts_tests/tests/google/instrumentation/power/vzw_dou_automation/VzWDoUAutomationIdleTest.py
index adf9b8d..486dc54 100644
--- a/acts_tests/tests/google/instrumentation/power/vzw_dou_automation/VzWDoUAutomationIdleTest.py
+++ b/acts_tests/tests/google/instrumentation/power/vzw_dou_automation/VzWDoUAutomationIdleTest.py
@@ -15,10 +15,10 @@
# limitations under the License.
from acts.test_decorators import repeated_test
-from acts_contrib.test_utils.instrumentation.power.vzw_dou_automation import \
+from acts.test_utils.instrumentation.power.vzw_dou_automation import \
vzw_dou_automation_base_test
-from acts_contrib.test_utils.instrumentation.device.command.adb_commands import common
-from acts_contrib.test_utils.instrumentation.device.command.adb_commands import goog
+from acts.test_utils.instrumentation.device.command.adb_commands import common
+from acts.test_utils.instrumentation.device.command.adb_commands import goog
class VzWDoUAutomationIdleTest(
diff --git a/acts_tests/tests/google/instrumentation/power/vzw_dou_automation/VzWDoUAutomationPhoneCallTest.py b/acts_tests/tests/google/instrumentation/power/vzw_dou_automation/VzWDoUAutomationPhoneCallTest.py
index 4185219..ed76a7d 100644
--- a/acts_tests/tests/google/instrumentation/power/vzw_dou_automation/VzWDoUAutomationPhoneCallTest.py
+++ b/acts_tests/tests/google/instrumentation/power/vzw_dou_automation/VzWDoUAutomationPhoneCallTest.py
@@ -17,12 +17,12 @@
import time
from acts.test_decorators import repeated_test
-from acts_contrib.test_utils.instrumentation.device.command.adb_commands import goog
-from acts_contrib.test_utils.instrumentation.power.vzw_dou_automation import \
+from acts.test_utils.instrumentation.device.command.adb_commands import goog
+from acts.test_utils.instrumentation.power.vzw_dou_automation import \
vzw_dou_automation_comp_base_test
-from acts_contrib.test_utils.instrumentation.power.vzw_dou_automation import \
+from acts.test_utils.instrumentation.power.vzw_dou_automation import \
vzw_dou_automation_base_test
-from acts_contrib.test_utils.instrumentation.device.command.adb_commands import common
+from acts.test_utils.instrumentation.device.command.adb_commands import common
class VzWDoUAutomationPhoneCallTest(
vzw_dou_automation_comp_base_test.VzWDoUAutomationCompBaseTest):
diff --git a/acts_tests/tests/google/instrumentation/power/vzwdou/VzwDoUIdleTest.py b/acts_tests/tests/google/instrumentation/power/vzwdou/VzwDoUIdleTest.py
index 527bad2..4ad6d64 100644
--- a/acts_tests/tests/google/instrumentation/power/vzwdou/VzwDoUIdleTest.py
+++ b/acts_tests/tests/google/instrumentation/power/vzwdou/VzwDoUIdleTest.py
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-from acts_contrib.test_utils.instrumentation.power.vzwdou import vzw_dou_base_test
+from acts.test_utils.instrumentation.power.vzwdou import vzw_dou_base_test
class VzwDoUIdleTest(vzw_dou_base_test.VzwDoUBaseTest):
"""Class for running VZW DoU idle test cases"""
diff --git a/acts_tests/tests/google/native/NativeTest.py b/acts_tests/tests/google/native/NativeTest.py
index b62b456..90ebceb 100644
--- a/acts_tests/tests/google/native/NativeTest.py
+++ b/acts_tests/tests/google/native/NativeTest.py
@@ -16,8 +16,8 @@
import time
from acts.base_test import BaseTestClass
-from acts_contrib.test_utils.bt.native_bt_test_utils import setup_native_bluetooth
-from acts_contrib.test_utils.bt.bt_test_utils import generate_id_by_size
+from acts.test_utils.bt.native_bt_test_utils import setup_native_bluetooth
+from acts.test_utils.bt.bt_test_utils import generate_id_by_size
class NativeTest(BaseTestClass):
tests = None
diff --git a/acts_tests/tests/google/native/bt/BtNativeTest.py b/acts_tests/tests/google/native/bt/BtNativeTest.py
index abb8f17..55674bc 100644
--- a/acts_tests/tests/google/native/bt/BtNativeTest.py
+++ b/acts_tests/tests/google/native/bt/BtNativeTest.py
@@ -1,7 +1,7 @@
from acts.base_test import BaseTestClass
from acts.controllers import native_android_device
-from acts_contrib.test_utils.bt.native_bt_test_utils import setup_native_bluetooth
-from acts_contrib.test_utils.bt.bt_test_utils import generate_id_by_size
+from acts.test_utils.bt.native_bt_test_utils import setup_native_bluetooth
+from acts.test_utils.bt.bt_test_utils import generate_id_by_size
class BtNativeTest(BaseTestClass):
diff --git a/acts_tests/tests/google/net/ApfCountersTest.py b/acts_tests/tests/google/net/ApfCountersTest.py
index 0b4f3dc..4033377 100755
--- a/acts_tests/tests/google/net/ApfCountersTest.py
+++ b/acts_tests/tests/google/net/ApfCountersTest.py
@@ -15,17 +15,17 @@
from acts import asserts
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.net.net_test_utils import start_tcpdump
-from acts_contrib.test_utils.net.net_test_utils import stop_tcpdump
-from acts_contrib.test_utils.wifi.WifiBaseTest import WifiBaseTest
-from acts_contrib.test_utils.wifi import wifi_test_utils as wutils
+from acts.test_utils.net.net_test_utils import start_tcpdump
+from acts.test_utils.net.net_test_utils import stop_tcpdump
+from acts.test_utils.wifi.WifiBaseTest import WifiBaseTest
+from acts.test_utils.wifi import wifi_test_utils as wutils
from scapy.all import ICMPv6ND_RA
from scapy.all import rdpcap
from scapy.all import Scapy_Exception
import acts.base_test
-import acts_contrib.test_utils.wifi.wifi_test_utils as wutils
+import acts.test_utils.wifi.wifi_test_utils as wutils
import copy
import os
diff --git a/acts_tests/tests/google/net/BluetoothTetheringTest.py b/acts_tests/tests/google/net/BluetoothTetheringTest.py
index e4d3c67..df7bad5 100644
--- a/acts_tests/tests/google/net/BluetoothTetheringTest.py
+++ b/acts_tests/tests/google/net/BluetoothTetheringTest.py
@@ -18,12 +18,12 @@
from acts import asserts
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
-from acts_contrib.test_utils.bt.bt_test_utils import orchestrate_and_verify_pan_connection
-from acts_contrib.test_utils.bt.bt_test_utils import setup_multiple_devices_for_bt_test
-from acts_contrib.test_utils.net import net_test_utils as nutils
-from acts_contrib.test_utils.tel.tel_test_utils import wait_for_cell_data_connection
-from acts_contrib.test_utils.wifi import wifi_test_utils as wutils
+from acts.test_utils.bt.BluetoothBaseTest import BluetoothBaseTest
+from acts.test_utils.bt.bt_test_utils import orchestrate_and_verify_pan_connection
+from acts.test_utils.bt.bt_test_utils import setup_multiple_devices_for_bt_test
+from acts.test_utils.net import net_test_utils as nutils
+from acts.test_utils.tel.tel_test_utils import wait_for_cell_data_connection
+from acts.test_utils.wifi import wifi_test_utils as wutils
DEFAULT_PING_URL = "https://www.google.com/robots.txt"
diff --git a/acts_tests/tests/google/net/CaptivePortalTest.py b/acts_tests/tests/google/net/CaptivePortalTest.py
index 5b03ea2..7df4372 100644
--- a/acts_tests/tests/google/net/CaptivePortalTest.py
+++ b/acts_tests/tests/google/net/CaptivePortalTest.py
@@ -18,11 +18,11 @@
from acts import asserts
from acts import base_test
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.net import connectivity_const as cconst
-from acts_contrib.test_utils.net import connectivity_test_utils as cutils
-from acts_contrib.test_utils.net import ui_utils as uutils
-from acts_contrib.test_utils.wifi import wifi_test_utils as wutils
-from acts_contrib.test_utils.wifi.WifiBaseTest import WifiBaseTest
+from acts.test_utils.net import connectivity_const as cconst
+from acts.test_utils.net import connectivity_test_utils as cutils
+from acts.test_utils.net import ui_utils as uutils
+from acts.test_utils.wifi import wifi_test_utils as wutils
+from acts.test_utils.wifi.WifiBaseTest import WifiBaseTest
WifiEnums = wutils.WifiEnums
IFACE = "InterfaceName"
diff --git a/acts_tests/tests/google/net/CoreNetworkingOTATest.py b/acts_tests/tests/google/net/CoreNetworkingOTATest.py
index 019409a..5b350f8 100755
--- a/acts_tests/tests/google/net/CoreNetworkingOTATest.py
+++ b/acts_tests/tests/google/net/CoreNetworkingOTATest.py
@@ -26,10 +26,10 @@
from acts.base_test import BaseTestClass
from acts.libs.ota import ota_updater
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.net import connectivity_const as cconst
+from acts.test_utils.net import connectivity_const as cconst
-import acts_contrib.test_utils.net.net_test_utils as nutils
-import acts_contrib.test_utils.wifi.wifi_test_utils as wutils
+import acts.test_utils.net.net_test_utils as nutils
+import acts.test_utils.wifi.wifi_test_utils as wutils
VPN_CONST = cconst.VpnProfile
VPN_TYPE = cconst.VpnProfileType
diff --git a/acts_tests/tests/google/net/CoreNetworkingTest.py b/acts_tests/tests/google/net/CoreNetworkingTest.py
index fc32f92..308beda 100644
--- a/acts_tests/tests/google/net/CoreNetworkingTest.py
+++ b/acts_tests/tests/google/net/CoreNetworkingTest.py
@@ -17,8 +17,8 @@
from acts import base_test
from acts.controllers import adb
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.net import net_test_utils as nutils
-from acts_contrib.test_utils.wifi import wifi_test_utils as wutils
+from acts.test_utils.net import net_test_utils as nutils
+from acts.test_utils.wifi import wifi_test_utils as wutils
dum_class = "com.android.tests.connectivity.uid.ConnectivityTestActivity"
diff --git a/acts_tests/tests/google/net/DataCostTest.py b/acts_tests/tests/google/net/DataCostTest.py
index 6174009..a07fdcd 100644
--- a/acts_tests/tests/google/net/DataCostTest.py
+++ b/acts_tests/tests/google/net/DataCostTest.py
@@ -27,14 +27,14 @@
from acts import test_runner
from acts.controllers import adb
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.net import net_test_utils as nutils
-from acts_contrib.test_utils.tel.tel_test_utils import _check_file_existance
-from acts_contrib.test_utils.tel.tel_test_utils import _generate_file_directory_and_file_name
-from acts_contrib.test_utils.wifi import wifi_test_utils as wutils
-from acts_contrib.test_utils.net.connectivity_const import MULTIPATH_PREFERENCE_NONE as NONE
-from acts_contrib.test_utils.net.connectivity_const import MULTIPATH_PREFERENCE_HANDOVER as HANDOVER
-from acts_contrib.test_utils.net.connectivity_const import MULTIPATH_PREFERENCE_RELIABILITY as RELIABILITY
-from acts_contrib.test_utils.net.connectivity_const import MULTIPATH_PREFERENCE_PERFORMANCE as PERFORMANCE
+from acts.test_utils.net import net_test_utils as nutils
+from acts.test_utils.tel.tel_test_utils import _check_file_existance
+from acts.test_utils.tel.tel_test_utils import _generate_file_directory_and_file_name
+from acts.test_utils.wifi import wifi_test_utils as wutils
+from acts.test_utils.net.connectivity_const import MULTIPATH_PREFERENCE_NONE as NONE
+from acts.test_utils.net.connectivity_const import MULTIPATH_PREFERENCE_HANDOVER as HANDOVER
+from acts.test_utils.net.connectivity_const import MULTIPATH_PREFERENCE_RELIABILITY as RELIABILITY
+from acts.test_utils.net.connectivity_const import MULTIPATH_PREFERENCE_PERFORMANCE as PERFORMANCE
DOWNLOAD_PATH = "/sdcard/Download/"
RELIABLE = RELIABILITY | HANDOVER
diff --git a/acts_tests/tests/google/net/DataUsageTest.py b/acts_tests/tests/google/net/DataUsageTest.py
index 1582886..12a21c6 100644
--- a/acts_tests/tests/google/net/DataUsageTest.py
+++ b/acts_tests/tests/google/net/DataUsageTest.py
@@ -23,15 +23,15 @@
from acts.controllers.adb_lib.error import AdbError
from acts.controllers.ap_lib import hostapd_constants
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.net import connectivity_const as cconst
-from acts_contrib.test_utils.net import connectivity_test_utils as cutils
-from acts_contrib.test_utils.net import net_test_utils as nutils
-from acts_contrib.test_utils.net.net_test_utils import start_tcpdump
-from acts_contrib.test_utils.net.net_test_utils import stop_tcpdump
-from acts_contrib.test_utils.tel import tel_test_utils as ttutils
-from acts_contrib.test_utils.tel.tel_test_utils import get_operator_name
-from acts_contrib.test_utils.tel.tel_test_utils import http_file_download_by_chrome
-from acts_contrib.test_utils.wifi import wifi_test_utils as wutils
+from acts.test_utils.net import connectivity_const as cconst
+from acts.test_utils.net import connectivity_test_utils as cutils
+from acts.test_utils.net import net_test_utils as nutils
+from acts.test_utils.net.net_test_utils import start_tcpdump
+from acts.test_utils.net.net_test_utils import stop_tcpdump
+from acts.test_utils.tel import tel_test_utils as ttutils
+from acts.test_utils.tel.tel_test_utils import get_operator_name
+from acts.test_utils.tel.tel_test_utils import http_file_download_by_chrome
+from acts.test_utils.wifi import wifi_test_utils as wutils
import queue
from queue import Empty
diff --git a/acts_tests/tests/google/net/DnsOverTlsTest.py b/acts_tests/tests/google/net/DnsOverTlsTest.py
index 13d8fe1..5ab964b 100644
--- a/acts_tests/tests/google/net/DnsOverTlsTest.py
+++ b/acts_tests/tests/google/net/DnsOverTlsTest.py
@@ -18,16 +18,16 @@
from acts import asserts
from acts.controllers.openwrt_ap import MOBLY_CONTROLLER_CONFIG_NAME as OPENWRT
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.net import connectivity_const as cconst
-from acts_contrib.test_utils.net import connectivity_test_utils as cutils
-from acts_contrib.test_utils.net import net_test_utils as nutils
-from acts_contrib.test_utils.net.net_test_utils import start_tcpdump
-from acts_contrib.test_utils.net.net_test_utils import stop_tcpdump
-from acts_contrib.test_utils.tel.tel_defines import WFC_MODE_DISABLED
-from acts_contrib.test_utils.tel.tel_test_utils import get_operator_name
-from acts_contrib.test_utils.tel.tel_test_utils import set_wfc_mode
-from acts_contrib.test_utils.wifi import wifi_test_utils as wutils
-from acts_contrib.test_utils.wifi.WifiBaseTest import WifiBaseTest
+from acts.test_utils.net import connectivity_const as cconst
+from acts.test_utils.net import connectivity_test_utils as cutils
+from acts.test_utils.net import net_test_utils as nutils
+from acts.test_utils.net.net_test_utils import start_tcpdump
+from acts.test_utils.net.net_test_utils import stop_tcpdump
+from acts.test_utils.tel.tel_defines import WFC_MODE_DISABLED
+from acts.test_utils.tel.tel_test_utils import get_operator_name
+from acts.test_utils.tel.tel_test_utils import set_wfc_mode
+from acts.test_utils.wifi import wifi_test_utils as wutils
+from acts.test_utils.wifi.WifiBaseTest import WifiBaseTest
from scapy.all import rdpcap
from scapy.all import Scapy_Exception
from scapy.all import TCP
diff --git a/acts_tests/tests/google/net/IKEv2VpnOverLTETest.py b/acts_tests/tests/google/net/IKEv2VpnOverLTETest.py
index e0fb160..cd9c41a 100644
--- a/acts_tests/tests/google/net/IKEv2VpnOverLTETest.py
+++ b/acts_tests/tests/google/net/IKEv2VpnOverLTETest.py
@@ -16,9 +16,9 @@
from acts import base_test
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.net import connectivity_const
-from acts_contrib.test_utils.net import net_test_utils as nutils
-from acts_contrib.test_utils.wifi import wifi_test_utils as wutils
+from acts.test_utils.net import connectivity_const
+from acts.test_utils.net import net_test_utils as nutils
+from acts.test_utils.wifi import wifi_test_utils as wutils
VPN_CONST = connectivity_const.VpnProfile
VPN_TYPE = connectivity_const.VpnProfileType
diff --git a/acts_tests/tests/google/net/IKEv2VpnOverWifiTest.py b/acts_tests/tests/google/net/IKEv2VpnOverWifiTest.py
index 6196f61..1f36e9a 100644
--- a/acts_tests/tests/google/net/IKEv2VpnOverWifiTest.py
+++ b/acts_tests/tests/google/net/IKEv2VpnOverWifiTest.py
@@ -16,9 +16,9 @@
from acts import base_test
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.net import connectivity_const
-from acts_contrib.test_utils.net import net_test_utils as nutils
-from acts_contrib.test_utils.wifi import wifi_test_utils as wutils
+from acts.test_utils.net import connectivity_const
+from acts.test_utils.net import net_test_utils as nutils
+from acts.test_utils.wifi import wifi_test_utils as wutils
VPN_CONST = connectivity_const.VpnProfile
VPN_TYPE = connectivity_const.VpnProfileType
diff --git a/acts_tests/tests/google/net/IpSecTest.py b/acts_tests/tests/google/net/IpSecTest.py
index 4c61b3e..1b4a144 100644
--- a/acts_tests/tests/google/net/IpSecTest.py
+++ b/acts_tests/tests/google/net/IpSecTest.py
@@ -17,12 +17,12 @@
from acts import base_test
from acts.controllers import adb
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.net import connectivity_const as cconst
-from acts_contrib.test_utils.net import ipsec_test_utils as iutils
-from acts_contrib.test_utils.net import socket_test_utils as sutils
-from acts_contrib.test_utils.net.net_test_utils import start_tcpdump
-from acts_contrib.test_utils.net.net_test_utils import stop_tcpdump
-from acts_contrib.test_utils.wifi import wifi_test_utils as wutils
+from acts.test_utils.net import connectivity_const as cconst
+from acts.test_utils.net import ipsec_test_utils as iutils
+from acts.test_utils.net import socket_test_utils as sutils
+from acts.test_utils.net.net_test_utils import start_tcpdump
+from acts.test_utils.net.net_test_utils import stop_tcpdump
+from acts.test_utils.wifi import wifi_test_utils as wutils
import random
import time
diff --git a/acts_tests/tests/google/net/LegacyVpnTest.py b/acts_tests/tests/google/net/LegacyVpnTest.py
index 9a8465a..a4bfc52 100644
--- a/acts_tests/tests/google/net/LegacyVpnTest.py
+++ b/acts_tests/tests/google/net/LegacyVpnTest.py
@@ -25,10 +25,10 @@
from acts import test_runner
from acts.controllers import adb
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.net import connectivity_const
-from acts_contrib.test_utils.net import net_test_utils as nutils
-from acts_contrib.test_utils.wifi import wifi_test_utils as wutils
-from acts_contrib.test_utils.wifi.WifiBaseTest import WifiBaseTest
+from acts.test_utils.net import connectivity_const
+from acts.test_utils.net import net_test_utils as nutils
+from acts.test_utils.wifi import wifi_test_utils as wutils
+from acts.test_utils.wifi.WifiBaseTest import WifiBaseTest
VPN_CONST = connectivity_const.VpnProfile
VPN_TYPE = connectivity_const.VpnProfileType
diff --git a/acts_tests/tests/google/net/ProxyTest.py b/acts_tests/tests/google/net/ProxyTest.py
index 0511632..4162e82 100644
--- a/acts_tests/tests/google/net/ProxyTest.py
+++ b/acts_tests/tests/google/net/ProxyTest.py
@@ -16,9 +16,9 @@
from acts import asserts
from acts import base_test
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.net.net_test_utils import start_tcpdump
-from acts_contrib.test_utils.net.net_test_utils import stop_tcpdump
-from acts_contrib.test_utils.wifi import wifi_test_utils as wutils
+from acts.test_utils.net.net_test_utils import start_tcpdump
+from acts.test_utils.net.net_test_utils import stop_tcpdump
+from acts.test_utils.wifi import wifi_test_utils as wutils
from scapy.all import IP
diff --git a/acts_tests/tests/google/net/SocketKeepaliveTest.py b/acts_tests/tests/google/net/SocketKeepaliveTest.py
index d348b72..5c63497 100644
--- a/acts_tests/tests/google/net/SocketKeepaliveTest.py
+++ b/acts_tests/tests/google/net/SocketKeepaliveTest.py
@@ -19,12 +19,12 @@
from acts import asserts
from acts import base_test
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.net import connectivity_test_utils as cutils
-from acts_contrib.test_utils.net import net_test_utils as nutils
-from acts_contrib.test_utils.net import socket_test_utils as sutils
-from acts_contrib.test_utils.net.net_test_utils import start_tcpdump
-from acts_contrib.test_utils.net.net_test_utils import stop_tcpdump
-from acts_contrib.test_utils.wifi import wifi_test_utils as wutils
+from acts.test_utils.net import connectivity_test_utils as cutils
+from acts.test_utils.net import net_test_utils as nutils
+from acts.test_utils.net import socket_test_utils as sutils
+from acts.test_utils.net.net_test_utils import start_tcpdump
+from acts.test_utils.net.net_test_utils import stop_tcpdump
+from acts.test_utils.wifi import wifi_test_utils as wutils
from scapy.all import rdpcap
from scapy.all import Scapy_Exception
from scapy.all import TCP
diff --git a/acts_tests/tests/google/net/UsbTetheringTest.py b/acts_tests/tests/google/net/UsbTetheringTest.py
index e02611e..8df51f5 100644
--- a/acts_tests/tests/google/net/UsbTetheringTest.py
+++ b/acts_tests/tests/google/net/UsbTetheringTest.py
@@ -1,8 +1,8 @@
from acts import asserts
from acts import base_test
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.net import net_test_utils as nutils
-from acts_contrib.test_utils.wifi import wifi_test_utils as wutils
+from acts.test_utils.net import net_test_utils as nutils
+from acts.test_utils.wifi import wifi_test_utils as wutils
from scapy.all import get_if_list
from scapy.all import get_if_raw_hwaddr
diff --git a/acts_tests/tests/google/net/VpnOverLTETest.py b/acts_tests/tests/google/net/VpnOverLTETest.py
index fdb7e26..a7e4172 100644
--- a/acts_tests/tests/google/net/VpnOverLTETest.py
+++ b/acts_tests/tests/google/net/VpnOverLTETest.py
@@ -15,10 +15,10 @@
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.net import connectivity_const
-from acts_contrib.test_utils.net import net_test_utils as nutils
-from acts_contrib.test_utils.wifi import wifi_test_utils as wutils
-from acts_contrib.test_utils.wifi.WifiBaseTest import WifiBaseTest
+from acts.test_utils.net import connectivity_const
+from acts.test_utils.net import net_test_utils as nutils
+from acts.test_utils.wifi import wifi_test_utils as wutils
+from acts.test_utils.wifi.WifiBaseTest import WifiBaseTest
VPN_CONST = connectivity_const.VpnProfile
VPN_TYPE = connectivity_const.VpnProfileType
diff --git a/acts_tests/tests/google/power/PowerBaselineTest.py b/acts_tests/tests/google/power/PowerBaselineTest.py
index e056371..f1904e3 100644
--- a/acts_tests/tests/google/power/PowerBaselineTest.py
+++ b/acts_tests/tests/google/power/PowerBaselineTest.py
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-from acts_contrib.test_utils.power.PowerBaseTest import PowerBaseTest
+from acts.test_utils.power.PowerBaseTest import PowerBaseTest
class PowerBaselineTest(PowerBaseTest):
diff --git a/acts_tests/tests/google/power/bt/PowerBLEadvertiseTest.py b/acts_tests/tests/google/power/bt/PowerBLEadvertiseTest.py
index 4f42ae0..1933699 100644
--- a/acts_tests/tests/google/power/bt/PowerBLEadvertiseTest.py
+++ b/acts_tests/tests/google/power/bt/PowerBLEadvertiseTest.py
@@ -15,9 +15,9 @@
# limitations under the License.
import time
-import acts_contrib.test_utils.bt.BleEnum as bleenum
-import acts_contrib.test_utils.bt.bt_power_test_utils as btputils
-import acts_contrib.test_utils.power.PowerBTBaseTest as PBtBT
+import acts.test_utils.bt.BleEnum as bleenum
+import acts.test_utils.bt.bt_power_test_utils as btputils
+import acts.test_utils.power.PowerBTBaseTest as PBtBT
BLE_LOCATION_SCAN_ENABLE = 'settings put secure location_mode 3'
EXTRA_ADV_TIME = 3
diff --git a/acts_tests/tests/google/power/bt/PowerBLEscanTest.py b/acts_tests/tests/google/power/bt/PowerBLEscanTest.py
index 0aa5ad9..f859f0c 100644
--- a/acts_tests/tests/google/power/bt/PowerBLEscanTest.py
+++ b/acts_tests/tests/google/power/bt/PowerBLEscanTest.py
@@ -15,9 +15,9 @@
# limitations under the License.
import time
-import acts_contrib.test_utils.bt.BleEnum as bleenum
-import acts_contrib.test_utils.bt.bt_power_test_utils as btputils
-import acts_contrib.test_utils.power.PowerBTBaseTest as PBtBT
+import acts.test_utils.bt.BleEnum as bleenum
+import acts.test_utils.bt.bt_power_test_utils as btputils
+import acts.test_utils.power.PowerBTBaseTest as PBtBT
BLE_LOCATION_SCAN_ENABLE = 'settings put secure location_mode 3'
EXTRA_SCAN_TIME = 3
diff --git a/acts_tests/tests/google/power/bt/PowerBTa2dpTest.py b/acts_tests/tests/google/power/bt/PowerBTa2dpTest.py
index 2d0bc9d..b6d60f1 100644
--- a/acts_tests/tests/google/power/bt/PowerBTa2dpTest.py
+++ b/acts_tests/tests/google/power/bt/PowerBTa2dpTest.py
@@ -15,10 +15,10 @@
# limitations under the License.
import time
-import acts_contrib.test_utils.bt.bt_test_utils as btutils
-import acts_contrib.test_utils.power.PowerBTBaseTest as PBtBT
+import acts.test_utils.bt.bt_test_utils as btutils
+import acts.test_utils.power.PowerBTBaseTest as PBtBT
from acts import asserts
-from acts_contrib.test_utils.bt import BtEnum
+from acts.test_utils.bt import BtEnum
EXTRA_PLAY_TIME = 10
diff --git a/acts_tests/tests/google/power/bt/PowerBTcalibrationTest.py b/acts_tests/tests/google/power/bt/PowerBTcalibrationTest.py
index 13b3f39..4b14f17 100644
--- a/acts_tests/tests/google/power/bt/PowerBTcalibrationTest.py
+++ b/acts_tests/tests/google/power/bt/PowerBTcalibrationTest.py
@@ -17,8 +17,8 @@
import csv
import os
import time
-import acts_contrib.test_utils.bt.bt_test_utils as btutils
-import acts_contrib.test_utils.power.PowerBTBaseTest as PBtBT
+import acts.test_utils.bt.bt_test_utils as btutils
+import acts.test_utils.power.PowerBTBaseTest as PBtBT
EXTRA_PLAY_TIME = 30
diff --git a/acts_tests/tests/google/power/bt/PowerBTidleTest.py b/acts_tests/tests/google/power/bt/PowerBTidleTest.py
index 79831e7..bab79d0 100644
--- a/acts_tests/tests/google/power/bt/PowerBTidleTest.py
+++ b/acts_tests/tests/google/power/bt/PowerBTidleTest.py
@@ -15,8 +15,8 @@
# limitations under the License.
import time
-import acts_contrib.test_utils.power.PowerBTBaseTest as PBtBT
-import acts_contrib.test_utils.bt.bt_test_utils as btutils
+import acts.test_utils.power.PowerBTBaseTest as PBtBT
+import acts.test_utils.bt.bt_test_utils as btutils
SCREEN_OFF_WAIT_TIME = 2
diff --git a/acts_tests/tests/google/power/coex/PowerCoexbaselineTest.py b/acts_tests/tests/google/power/coex/PowerCoexbaselineTest.py
index 5b6c8c1..19d7763 100644
--- a/acts_tests/tests/google/power/coex/PowerCoexbaselineTest.py
+++ b/acts_tests/tests/google/power/coex/PowerCoexbaselineTest.py
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-import acts_contrib.test_utils.power.PowerCoexBaseTest as PCoBT
+import acts.test_utils.power.PowerCoexBaseTest as PCoBT
from acts.test_decorators import test_tracker_info
diff --git a/acts_tests/tests/google/power/coex/PowerCoexscanTest.py b/acts_tests/tests/google/power/coex/PowerCoexscanTest.py
index f15f76b..3d1f1e3 100644
--- a/acts_tests/tests/google/power/coex/PowerCoexscanTest.py
+++ b/acts_tests/tests/google/power/coex/PowerCoexscanTest.py
@@ -15,7 +15,7 @@
# limitations under the License.
import math
-import acts_contrib.test_utils.power.PowerCoexBaseTest as PCoBT
+import acts.test_utils.power.PowerCoexBaseTest as PCoBT
from acts.test_decorators import test_tracker_info
diff --git a/acts_tests/tests/google/power/gnss/PowerGnssDpoSimTest.py b/acts_tests/tests/google/power/gnss/PowerGnssDpoSimTest.py
index 726b274..35e9582 100644
--- a/acts_tests/tests/google/power/gnss/PowerGnssDpoSimTest.py
+++ b/acts_tests/tests/google/power/gnss/PowerGnssDpoSimTest.py
@@ -14,9 +14,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-import acts_contrib.test_utils.power.PowerGnssBaseTest as GBT
-from acts_contrib.test_utils.gnss import dut_log_test_utils as diaglog
-from acts_contrib.test_utils.gnss import gnss_test_utils as gutil
+import acts.test_utils.power.PowerGnssBaseTest as GBT
+from acts.test_utils.gnss import dut_log_test_utils as diaglog
+from acts.test_utils.gnss import gnss_test_utils as gutil
import time
import os
from acts import utils
diff --git a/acts_tests/tests/google/power/tel/PowerTelHotspot_LTE_Test.py b/acts_tests/tests/google/power/tel/PowerTelHotspot_LTE_Test.py
index ad98e85..dd9502e 100644
--- a/acts_tests/tests/google/power/tel/PowerTelHotspot_LTE_Test.py
+++ b/acts_tests/tests/google/power/tel/PowerTelHotspot_LTE_Test.py
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-import acts_contrib.test_utils.power.cellular.cellular_hotspot_traffic_power_test as chtpw
+import acts.test_utils.power.cellular.cellular_hotspot_traffic_power_test as chtpw
class PowerTelHotspot_LTE_Test(chtpw.PowerTelHotspotTest):
diff --git a/acts_tests/tests/google/power/tel/PowerTelIdle_LTE_Test.py b/acts_tests/tests/google/power/tel/PowerTelIdle_LTE_Test.py
index 12c9973..47151aa 100644
--- a/acts_tests/tests/google/power/tel/PowerTelIdle_LTE_Test.py
+++ b/acts_tests/tests/google/power/tel/PowerTelIdle_LTE_Test.py
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-import acts_contrib.test_utils.power.cellular.cellular_idle_power_test as cipt
+import acts.test_utils.power.cellular.cellular_idle_power_test as cipt
class PowerTelIdle_LTE_Test(cipt.PowerTelIdleTest):
diff --git a/acts_tests/tests/google/power/tel/PowerTelIdle_Modem_Test.py b/acts_tests/tests/google/power/tel/PowerTelIdle_Modem_Test.py
index 5ba1674..40095fb 100644
--- a/acts_tests/tests/google/power/tel/PowerTelIdle_Modem_Test.py
+++ b/acts_tests/tests/google/power/tel/PowerTelIdle_Modem_Test.py
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-import acts_contrib.test_utils.power.cellular.cellular_idle_power_test as cipt
+import acts.test_utils.power.cellular.cellular_idle_power_test as cipt
class PowerTelIdle_Modem_Test(cipt.PowerTelIdleTest):
diff --git a/acts_tests/tests/google/power/tel/PowerTelIdle_UMTS_Test.py b/acts_tests/tests/google/power/tel/PowerTelIdle_UMTS_Test.py
index 7af7fea..07617be 100644
--- a/acts_tests/tests/google/power/tel/PowerTelIdle_UMTS_Test.py
+++ b/acts_tests/tests/google/power/tel/PowerTelIdle_UMTS_Test.py
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-import acts_contrib.test_utils.power.cellular.cellular_idle_power_test as cipt
+import acts.test_utils.power.cellular.cellular_idle_power_test as cipt
class PowerTelIdle_UMTS_Test(cipt.PowerTelIdleTest):
diff --git a/acts_tests/tests/google/power/tel/PowerTelMac_Modem_Test.py b/acts_tests/tests/google/power/tel/PowerTelMac_Modem_Test.py
index 2ee5c5b..0ceade6 100644
--- a/acts_tests/tests/google/power/tel/PowerTelMac_Modem_Test.py
+++ b/acts_tests/tests/google/power/tel/PowerTelMac_Modem_Test.py
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-import acts_contrib.test_utils.power.cellular.cellular_pdcch_power_test as cppt
+import acts.test_utils.power.cellular.cellular_pdcch_power_test as cppt
class PowerTelMac_Modem_Test(cppt.PowerTelPDCCHTest):
diff --git a/acts_tests/tests/google/power/tel/PowerTelPdcch_Modem_Test.py b/acts_tests/tests/google/power/tel/PowerTelPdcch_Modem_Test.py
index 18dcf0e..47b987a 100644
--- a/acts_tests/tests/google/power/tel/PowerTelPdcch_Modem_Test.py
+++ b/acts_tests/tests/google/power/tel/PowerTelPdcch_Modem_Test.py
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-import acts_contrib.test_utils.power.cellular.cellular_pdcch_power_test as cppt
+import acts.test_utils.power.cellular.cellular_pdcch_power_test as cppt
class PowerTelPdcch_Modem_Test(cppt.PowerTelPDCCHTest):
diff --git a/acts_tests/tests/google/power/tel/PowerTelStandby_LTE_Test.py b/acts_tests/tests/google/power/tel/PowerTelStandby_LTE_Test.py
index 7836f6b..36e2021 100644
--- a/acts_tests/tests/google/power/tel/PowerTelStandby_LTE_Test.py
+++ b/acts_tests/tests/google/power/tel/PowerTelStandby_LTE_Test.py
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-import acts_contrib.test_utils.power.cellular.cellular_idle_power_test as cipt
+import acts.test_utils.power.cellular.cellular_idle_power_test as cipt
class PowerTelStandby_LTE_Test(cipt.PowerTelIdleTest):
diff --git a/acts_tests/tests/google/power/tel/PowerTelTraffic_GSM_Test.py b/acts_tests/tests/google/power/tel/PowerTelTraffic_GSM_Test.py
index 934d827..b99aba0 100644
--- a/acts_tests/tests/google/power/tel/PowerTelTraffic_GSM_Test.py
+++ b/acts_tests/tests/google/power/tel/PowerTelTraffic_GSM_Test.py
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-import acts_contrib.test_utils.power.cellular.cellular_traffic_power_test as ctpt
+import acts.test_utils.power.cellular.cellular_traffic_power_test as ctpt
class PowerTelTraffic_GSM_Test(ctpt.PowerTelTrafficTest):
diff --git a/acts_tests/tests/google/power/tel/PowerTelTraffic_LTECA_Test.py b/acts_tests/tests/google/power/tel/PowerTelTraffic_LTECA_Test.py
index 71d5840..1e94c3b 100644
--- a/acts_tests/tests/google/power/tel/PowerTelTraffic_LTECA_Test.py
+++ b/acts_tests/tests/google/power/tel/PowerTelTraffic_LTECA_Test.py
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-import acts_contrib.test_utils.power.cellular.cellular_traffic_power_test as ctpt
+import acts.test_utils.power.cellular.cellular_traffic_power_test as ctpt
class PowerTelTraffic_LTECA_Test(ctpt.PowerTelTrafficTest):
diff --git a/acts_tests/tests/google/power/tel/PowerTelTraffic_LTE_Test.py b/acts_tests/tests/google/power/tel/PowerTelTraffic_LTE_Test.py
index 3fb2fa7..7facc34 100644
--- a/acts_tests/tests/google/power/tel/PowerTelTraffic_LTE_Test.py
+++ b/acts_tests/tests/google/power/tel/PowerTelTraffic_LTE_Test.py
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-import acts_contrib.test_utils.power.cellular.cellular_traffic_power_test as ctpt
+import acts.test_utils.power.cellular.cellular_traffic_power_test as ctpt
class PowerTelTraffic_LTE_Test(ctpt.PowerTelTrafficTest):
diff --git a/acts_tests/tests/google/power/tel/PowerTelTraffic_Modem_Test.py b/acts_tests/tests/google/power/tel/PowerTelTraffic_Modem_Test.py
index 61897ee..1206639 100644
--- a/acts_tests/tests/google/power/tel/PowerTelTraffic_Modem_Test.py
+++ b/acts_tests/tests/google/power/tel/PowerTelTraffic_Modem_Test.py
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-import acts_contrib.test_utils.power.cellular.cellular_traffic_power_test as ctpt
+import acts.test_utils.power.cellular.cellular_traffic_power_test as ctpt
class PowerTelTraffic_Modem_Test(ctpt.PowerTelTrafficTest):
diff --git a/acts_tests/tests/google/power/tel/PowerTelTraffic_TxSweep_Test.py b/acts_tests/tests/google/power/tel/PowerTelTraffic_TxSweep_Test.py
index 09af00c..ee4740c 100644
--- a/acts_tests/tests/google/power/tel/PowerTelTraffic_TxSweep_Test.py
+++ b/acts_tests/tests/google/power/tel/PowerTelTraffic_TxSweep_Test.py
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-import acts_contrib.test_utils.power.cellular.cellular_traffic_power_test as ctpt
+import acts.test_utils.power.cellular.cellular_traffic_power_test as ctpt
class PowerTelTraffic_TxSweep_Test(ctpt.PowerTelTxPowerSweepTest):
diff --git a/acts_tests/tests/google/power/tel/PowerTelTraffic_UMTS_Test.py b/acts_tests/tests/google/power/tel/PowerTelTraffic_UMTS_Test.py
index 406b643..acc2048 100644
--- a/acts_tests/tests/google/power/tel/PowerTelTraffic_UMTS_Test.py
+++ b/acts_tests/tests/google/power/tel/PowerTelTraffic_UMTS_Test.py
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-import acts_contrib.test_utils.power.cellular.cellular_traffic_power_test as ctpt
+import acts.test_utils.power.cellular.cellular_traffic_power_test as ctpt
class PowerTelTraffic_UMTS_Test(ctpt.PowerTelTrafficTest):
diff --git a/acts_tests/tests/google/power/tel/PowerTelVoiceCall_LTE_Test.py b/acts_tests/tests/google/power/tel/PowerTelVoiceCall_LTE_Test.py
index 206004f..f352418 100644
--- a/acts_tests/tests/google/power/tel/PowerTelVoiceCall_LTE_Test.py
+++ b/acts_tests/tests/google/power/tel/PowerTelVoiceCall_LTE_Test.py
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-import acts_contrib.test_utils.power.cellular.cellular_volte_power_test as cvltept
+import acts.test_utils.power.cellular.cellular_volte_power_test as cvltept
class PowerTelVoiceCall_LTE_Test(cvltept.PowerTelVoLTECallTest):
diff --git a/acts_tests/tests/google/power/tel/PowerTelVoiceCall_UMTS_Test.py b/acts_tests/tests/google/power/tel/PowerTelVoiceCall_UMTS_Test.py
index 6a92da9..3201cb9 100644
--- a/acts_tests/tests/google/power/tel/PowerTelVoiceCall_UMTS_Test.py
+++ b/acts_tests/tests/google/power/tel/PowerTelVoiceCall_UMTS_Test.py
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-import acts_contrib.test_utils.power.cellular.cellular_voice_call_power_test as cvcpt
+import acts.test_utils.power.cellular.cellular_voice_call_power_test as cvcpt
class PowerTelVoiceCall_UMTS_Test(cvcpt.PowerTelVoiceCallTest):
diff --git a/acts_tests/tests/google/power/wifi/PowerWiFiHotspotTest.py b/acts_tests/tests/google/power/wifi/PowerWiFiHotspotTest.py
index 74106c9..78388e6 100644
--- a/acts_tests/tests/google/power/wifi/PowerWiFiHotspotTest.py
+++ b/acts_tests/tests/google/power/wifi/PowerWiFiHotspotTest.py
@@ -16,12 +16,12 @@
import time
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.power import PowerWiFiBaseTest as PWBT
-from acts_contrib.test_utils.tel.tel_test_utils import WIFI_CONFIG_APBAND_2G
-from acts_contrib.test_utils.tel.tel_test_utils import WIFI_CONFIG_APBAND_5G
-from acts_contrib.test_utils.wifi import wifi_test_utils as wutils
-from acts_contrib.test_utils.wifi import wifi_power_test_utils as wputils
-from acts_contrib.test_utils.power.IperfHelper import IperfHelper
+from acts.test_utils.power import PowerWiFiBaseTest as PWBT
+from acts.test_utils.tel.tel_test_utils import WIFI_CONFIG_APBAND_2G
+from acts.test_utils.tel.tel_test_utils import WIFI_CONFIG_APBAND_5G
+from acts.test_utils.wifi import wifi_test_utils as wutils
+from acts.test_utils.wifi import wifi_power_test_utils as wputils
+from acts.test_utils.power.IperfHelper import IperfHelper
class PowerWiFiHotspotTest(PWBT.PowerWiFiBaseTest):
diff --git a/acts_tests/tests/google/power/wifi/PowerWiFibaselineTest.py b/acts_tests/tests/google/power/wifi/PowerWiFibaselineTest.py
index 8e442c4..213c81a 100644
--- a/acts_tests/tests/google/power/wifi/PowerWiFibaselineTest.py
+++ b/acts_tests/tests/google/power/wifi/PowerWiFibaselineTest.py
@@ -14,8 +14,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-from acts_contrib.test_utils.power import PowerWiFiBaseTest as PWBT
-from acts_contrib.test_utils.wifi import wifi_test_utils as wutils
+from acts.test_utils.power import PowerWiFiBaseTest as PWBT
+from acts.test_utils.wifi import wifi_test_utils as wutils
from acts.test_decorators import test_tracker_info
diff --git a/acts_tests/tests/google/power/wifi/PowerWiFidtimTest.py b/acts_tests/tests/google/power/wifi/PowerWiFidtimTest.py
index 2d6eec1..013931d 100644
--- a/acts_tests/tests/google/power/wifi/PowerWiFidtimTest.py
+++ b/acts_tests/tests/google/power/wifi/PowerWiFidtimTest.py
@@ -16,8 +16,8 @@
import time
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.power import PowerWiFiBaseTest as PWBT
-from acts_contrib.test_utils.wifi import wifi_power_test_utils as wputils
+from acts.test_utils.power import PowerWiFiBaseTest as PWBT
+from acts.test_utils.wifi import wifi_power_test_utils as wputils
class PowerWiFidtimTest(PWBT.PowerWiFiBaseTest):
diff --git a/acts_tests/tests/google/power/wifi/PowerWiFimulticastTest.py b/acts_tests/tests/google/power/wifi/PowerWiFimulticastTest.py
index 8b7e063..8832469 100644
--- a/acts_tests/tests/google/power/wifi/PowerWiFimulticastTest.py
+++ b/acts_tests/tests/google/power/wifi/PowerWiFimulticastTest.py
@@ -16,8 +16,8 @@
import time
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.power import PowerWiFiBaseTest as PWBT
-from acts_contrib.test_utils.wifi import wifi_power_test_utils as wputils
+from acts.test_utils.power import PowerWiFiBaseTest as PWBT
+from acts.test_utils.wifi import wifi_power_test_utils as wputils
from acts.controllers import packet_sender as pkt_utils
RA_SHORT_LIFETIME = 3
diff --git a/acts_tests/tests/google/power/wifi/PowerWiFiroamingTest.py b/acts_tests/tests/google/power/wifi/PowerWiFiroamingTest.py
index b366584..2a56a84 100644
--- a/acts_tests/tests/google/power/wifi/PowerWiFiroamingTest.py
+++ b/acts_tests/tests/google/power/wifi/PowerWiFiroamingTest.py
@@ -19,10 +19,10 @@
from acts import utils
from acts.controllers.ap_lib import hostapd_constants as hc
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.power import PowerWiFiBaseTest as PWBT
-from acts_contrib.test_utils.wifi import wifi_constants as wc
-from acts_contrib.test_utils.wifi import wifi_test_utils as wutils
-from acts_contrib.test_utils.power import plot_utils
+from acts.test_utils.power import PowerWiFiBaseTest as PWBT
+from acts.test_utils.wifi import wifi_constants as wc
+from acts.test_utils.wifi import wifi_test_utils as wutils
+from acts.test_utils.power import plot_utils
PHONE_BATTERY_VOLTAGE = 4.2
diff --git a/acts_tests/tests/google/power/wifi/PowerWiFiscanTest.py b/acts_tests/tests/google/power/wifi/PowerWiFiscanTest.py
index 72f733f..e1153c1 100644
--- a/acts_tests/tests/google/power/wifi/PowerWiFiscanTest.py
+++ b/acts_tests/tests/google/power/wifi/PowerWiFiscanTest.py
@@ -16,8 +16,8 @@
import time
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.power import PowerWiFiBaseTest as PWBT
-from acts_contrib.test_utils.wifi import wifi_test_utils as wutils
+from acts.test_utils.power import PowerWiFiBaseTest as PWBT
+from acts.test_utils.wifi import wifi_test_utils as wutils
UNLOCK_SCREEN = 'input keyevent 82'
LOCATION_ON = 'settings put secure location_mode 3'
diff --git a/acts_tests/tests/google/power/wifi/PowerWiFitrafficTest.py b/acts_tests/tests/google/power/wifi/PowerWiFitrafficTest.py
index 7ba9c35..c6b1a3e 100644
--- a/acts_tests/tests/google/power/wifi/PowerWiFitrafficTest.py
+++ b/acts_tests/tests/google/power/wifi/PowerWiFitrafficTest.py
@@ -16,8 +16,8 @@
import time
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.power import PowerWiFiBaseTest as PWBT
-from acts_contrib.test_utils.wifi import wifi_power_test_utils as wputils
+from acts.test_utils.power import PowerWiFiBaseTest as PWBT
+from acts.test_utils.wifi import wifi_power_test_utils as wputils
TEMP_FILE = '/sdcard/Download/tmp.log'
diff --git a/acts_tests/tests/google/tel/etc/manage_sim.py b/acts_tests/tests/google/tel/etc/manage_sim.py
index 91a3887..1d51cb0 100755
--- a/acts_tests/tests/google/tel/etc/manage_sim.py
+++ b/acts_tests/tests/google/tel/etc/manage_sim.py
@@ -23,9 +23,9 @@
import argparse
import json
import acts.controllers.android_device as android_device
-import acts_contrib.test_utils.tel.tel_defines as tel_defines
-import acts_contrib.test_utils.tel.tel_lookup_tables as tel_lookup_tables
-import acts_contrib.test_utils.tel.tel_test_utils as tel_test_utils
+import acts.test_utils.tel.tel_defines as tel_defines
+import acts.test_utils.tel.tel_lookup_tables as tel_lookup_tables
+import acts.test_utils.tel.tel_test_utils as tel_test_utils
def get_active_sim_list(verbose_warnings=False):
diff --git a/acts_tests/tests/google/tel/lab/TelLabCmasTest.py b/acts_tests/tests/google/tel/lab/TelLabCmasTest.py
index 4292c87..906c0a9 100644
--- a/acts_tests/tests/google/tel/lab/TelLabCmasTest.py
+++ b/acts_tests/tests/google/tel/lab/TelLabCmasTest.py
@@ -22,46 +22,46 @@
from acts.controllers.anritsu_lib.md8475a import CBCHSetup
from acts.controllers.anritsu_lib.md8475a import CTCHSetup
from acts.controllers.anritsu_lib.md8475a import MD8475A
-from acts_contrib.test_utils.tel.anritsu_utils import CMAS_C2K_CATEGORY_AMBER
-from acts_contrib.test_utils.tel.anritsu_utils import CMAS_C2K_CATEGORY_EXTREME
-from acts_contrib.test_utils.tel.anritsu_utils import CMAS_C2K_CATEGORY_PRESIDENTIAL
-from acts_contrib.test_utils.tel.anritsu_utils import CMAS_C2K_CERTIANTY_LIKELY
-from acts_contrib.test_utils.tel.anritsu_utils import CMAS_C2K_RESPONSETYPE_EVACUATE
-from acts_contrib.test_utils.tel.anritsu_utils import CMAS_C2K_RESPONSETYPE_MONITOR
-from acts_contrib.test_utils.tel.anritsu_utils import CMAS_C2K_RESPONSETYPE_SHELTER
-from acts_contrib.test_utils.tel.anritsu_utils import CMAS_C2K_SEVERITY_EXTREME
-from acts_contrib.test_utils.tel.anritsu_utils import CMAS_C2K_URGENCY_IMMEDIATE
-from acts_contrib.test_utils.tel.anritsu_utils import CMAS_C2K_CERTIANTY_OBSERVED
-from acts_contrib.test_utils.tel.anritsu_utils import CMAS_MESSAGE_CHILD_ABDUCTION_EMERGENCY
-from acts_contrib.test_utils.tel.anritsu_utils import CMAS_MESSAGE_EXTREME_IMMEDIATE_LIKELY
-from acts_contrib.test_utils.tel.anritsu_utils import CMAS_MESSAGE_PRESIDENTIAL_ALERT
-from acts_contrib.test_utils.tel.anritsu_utils import cb_serial_number
-from acts_contrib.test_utils.tel.anritsu_utils import cmas_receive_verify_message_cdma1x
-from acts_contrib.test_utils.tel.anritsu_utils import cmas_receive_verify_message_lte_wcdma
-from acts_contrib.test_utils.tel.anritsu_utils import set_system_model_1x
-from acts_contrib.test_utils.tel.anritsu_utils import set_system_model_1x_evdo
-from acts_contrib.test_utils.tel.anritsu_utils import set_system_model_lte
-from acts_contrib.test_utils.tel.anritsu_utils import set_system_model_gsm
-from acts_contrib.test_utils.tel.anritsu_utils import set_system_model_wcdma
-from acts_contrib.test_utils.tel.anritsu_utils import set_usim_parameters
-from acts_contrib.test_utils.tel.anritsu_utils import set_post_sim_params
-from acts_contrib.test_utils.tel.tel_defines import NETWORK_MODE_CDMA
-from acts_contrib.test_utils.tel.tel_defines import NETWORK_MODE_GSM_ONLY
-from acts_contrib.test_utils.tel.tel_defines import NETWORK_MODE_GSM_UMTS
-from acts_contrib.test_utils.tel.tel_defines import NETWORK_MODE_LTE_GSM_WCDMA
-from acts_contrib.test_utils.tel.tel_defines import RAT_1XRTT
-from acts_contrib.test_utils.tel.tel_defines import RAT_LTE
-from acts_contrib.test_utils.tel.tel_defines import RAT_GSM
-from acts_contrib.test_utils.tel.tel_defines import RAT_WCDMA
-from acts_contrib.test_utils.tel.tel_defines import RAT_FAMILY_CDMA2000
-from acts_contrib.test_utils.tel.tel_defines import RAT_FAMILY_GSM
-from acts_contrib.test_utils.tel.tel_defines import RAT_FAMILY_LTE
-from acts_contrib.test_utils.tel.tel_defines import RAT_FAMILY_UMTS
-from acts_contrib.test_utils.tel.tel_test_utils import ensure_network_rat
-from acts_contrib.test_utils.tel.tel_test_utils import ensure_phones_idle
-from acts_contrib.test_utils.tel.tel_test_utils import toggle_airplane_mode
-from acts_contrib.test_utils.tel.tel_test_utils import start_qxdm_loggers
-from acts_contrib.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
+from acts.test_utils.tel.anritsu_utils import CMAS_C2K_CATEGORY_AMBER
+from acts.test_utils.tel.anritsu_utils import CMAS_C2K_CATEGORY_EXTREME
+from acts.test_utils.tel.anritsu_utils import CMAS_C2K_CATEGORY_PRESIDENTIAL
+from acts.test_utils.tel.anritsu_utils import CMAS_C2K_CERTIANTY_LIKELY
+from acts.test_utils.tel.anritsu_utils import CMAS_C2K_RESPONSETYPE_EVACUATE
+from acts.test_utils.tel.anritsu_utils import CMAS_C2K_RESPONSETYPE_MONITOR
+from acts.test_utils.tel.anritsu_utils import CMAS_C2K_RESPONSETYPE_SHELTER
+from acts.test_utils.tel.anritsu_utils import CMAS_C2K_SEVERITY_EXTREME
+from acts.test_utils.tel.anritsu_utils import CMAS_C2K_URGENCY_IMMEDIATE
+from acts.test_utils.tel.anritsu_utils import CMAS_C2K_CERTIANTY_OBSERVED
+from acts.test_utils.tel.anritsu_utils import CMAS_MESSAGE_CHILD_ABDUCTION_EMERGENCY
+from acts.test_utils.tel.anritsu_utils import CMAS_MESSAGE_EXTREME_IMMEDIATE_LIKELY
+from acts.test_utils.tel.anritsu_utils import CMAS_MESSAGE_PRESIDENTIAL_ALERT
+from acts.test_utils.tel.anritsu_utils import cb_serial_number
+from acts.test_utils.tel.anritsu_utils import cmas_receive_verify_message_cdma1x
+from acts.test_utils.tel.anritsu_utils import cmas_receive_verify_message_lte_wcdma
+from acts.test_utils.tel.anritsu_utils import set_system_model_1x
+from acts.test_utils.tel.anritsu_utils import set_system_model_1x_evdo
+from acts.test_utils.tel.anritsu_utils import set_system_model_lte
+from acts.test_utils.tel.anritsu_utils import set_system_model_gsm
+from acts.test_utils.tel.anritsu_utils import set_system_model_wcdma
+from acts.test_utils.tel.anritsu_utils import set_usim_parameters
+from acts.test_utils.tel.anritsu_utils import set_post_sim_params
+from acts.test_utils.tel.tel_defines import NETWORK_MODE_CDMA
+from acts.test_utils.tel.tel_defines import NETWORK_MODE_GSM_ONLY
+from acts.test_utils.tel.tel_defines import NETWORK_MODE_GSM_UMTS
+from acts.test_utils.tel.tel_defines import NETWORK_MODE_LTE_GSM_WCDMA
+from acts.test_utils.tel.tel_defines import RAT_1XRTT
+from acts.test_utils.tel.tel_defines import RAT_LTE
+from acts.test_utils.tel.tel_defines import RAT_GSM
+from acts.test_utils.tel.tel_defines import RAT_WCDMA
+from acts.test_utils.tel.tel_defines import RAT_FAMILY_CDMA2000
+from acts.test_utils.tel.tel_defines import RAT_FAMILY_GSM
+from acts.test_utils.tel.tel_defines import RAT_FAMILY_LTE
+from acts.test_utils.tel.tel_defines import RAT_FAMILY_UMTS
+from acts.test_utils.tel.tel_test_utils import ensure_network_rat
+from acts.test_utils.tel.tel_test_utils import ensure_phones_idle
+from acts.test_utils.tel.tel_test_utils import toggle_airplane_mode
+from acts.test_utils.tel.tel_test_utils import start_qxdm_loggers
+from acts.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
from acts.test_decorators import test_tracker_info
WAIT_TIME_BETWEEN_REG_AND_MSG = 15 # default 15 sec
diff --git a/acts_tests/tests/google/tel/lab/TelLabDataRoamingTest.py b/acts_tests/tests/google/tel/lab/TelLabDataRoamingTest.py
index af4ca6c..8f09fea 100644
--- a/acts_tests/tests/google/tel/lab/TelLabDataRoamingTest.py
+++ b/acts_tests/tests/google/tel/lab/TelLabDataRoamingTest.py
@@ -23,18 +23,18 @@
from acts.controllers.anritsu_lib.md8475a import MD8475A
from acts.controllers.anritsu_lib.md8475a import BtsServiceState
from acts.controllers.anritsu_lib.md8475a import BtsPacketRate
-from acts_contrib.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
-from acts_contrib.test_utils.tel.anritsu_utils import set_system_model_lte_wcdma
-from acts_contrib.test_utils.tel.anritsu_utils import set_usim_parameters
-from acts_contrib.test_utils.tel.anritsu_utils import set_post_sim_params
-from acts_contrib.test_utils.tel.tel_defines import NETWORK_MODE_LTE_GSM_WCDMA
-from acts_contrib.test_utils.tel.tel_defines import RAT_FAMILY_LTE
-from acts_contrib.test_utils.tel.tel_test_utils import ensure_network_rat
-from acts_contrib.test_utils.tel.tel_test_utils import ensure_phones_idle
-from acts_contrib.test_utils.tel.tel_test_utils import toggle_airplane_mode
-from acts_contrib.test_utils.tel.tel_test_utils import toggle_cell_data_roaming
-from acts_contrib.test_utils.tel.tel_test_utils import set_preferred_apn_by_adb
-from acts_contrib.test_utils.tel.tel_test_utils import start_qxdm_loggers
+from acts.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
+from acts.test_utils.tel.anritsu_utils import set_system_model_lte_wcdma
+from acts.test_utils.tel.anritsu_utils import set_usim_parameters
+from acts.test_utils.tel.anritsu_utils import set_post_sim_params
+from acts.test_utils.tel.tel_defines import NETWORK_MODE_LTE_GSM_WCDMA
+from acts.test_utils.tel.tel_defines import RAT_FAMILY_LTE
+from acts.test_utils.tel.tel_test_utils import ensure_network_rat
+from acts.test_utils.tel.tel_test_utils import ensure_phones_idle
+from acts.test_utils.tel.tel_test_utils import toggle_airplane_mode
+from acts.test_utils.tel.tel_test_utils import toggle_cell_data_roaming
+from acts.test_utils.tel.tel_test_utils import set_preferred_apn_by_adb
+from acts.test_utils.tel.tel_test_utils import start_qxdm_loggers
from acts.utils import adb_shell_ping
PING_DURATION = 5 # Number of packets to ping
diff --git a/acts_tests/tests/google/tel/lab/TelLabDataTest.py b/acts_tests/tests/google/tel/lab/TelLabDataTest.py
index 9a1355d..c48446c 100644
--- a/acts_tests/tests/google/tel/lab/TelLabDataTest.py
+++ b/acts_tests/tests/google/tel/lab/TelLabDataTest.py
@@ -27,54 +27,54 @@
from acts.controllers.anritsu_lib.md8475a import MD8475A
from acts.controllers.anritsu_lib.md8475a import BtsBandwidth
from acts.controllers.anritsu_lib.md8475a import VirtualPhoneStatus
-from acts_contrib.test_utils.tel.anritsu_utils import cb_serial_number
-from acts_contrib.test_utils.tel.anritsu_utils import set_system_model_1x
-from acts_contrib.test_utils.tel.anritsu_utils import set_system_model_gsm
-from acts_contrib.test_utils.tel.anritsu_utils import set_system_model_lte
-from acts_contrib.test_utils.tel.anritsu_utils import set_system_model_lte_wcdma
-from acts_contrib.test_utils.tel.anritsu_utils import set_system_model_wcdma
-from acts_contrib.test_utils.tel.anritsu_utils import sms_mo_send
-from acts_contrib.test_utils.tel.anritsu_utils import sms_mt_receive_verify
-from acts_contrib.test_utils.tel.anritsu_utils import set_usim_parameters
-from acts_contrib.test_utils.tel.anritsu_utils import set_post_sim_params
-from acts_contrib.test_utils.tel.tel_defines import DIRECTION_MOBILE_ORIGINATED
-from acts_contrib.test_utils.tel.tel_defines import DIRECTION_MOBILE_TERMINATED
-from acts_contrib.test_utils.tel.tel_defines import NETWORK_MODE_CDMA
-from acts_contrib.test_utils.tel.tel_defines import NETWORK_MODE_GSM_ONLY
-from acts_contrib.test_utils.tel.tel_defines import NETWORK_MODE_GSM_UMTS
-from acts_contrib.test_utils.tel.tel_defines import NETWORK_MODE_LTE_GSM_WCDMA
-from acts_contrib.test_utils.tel.tel_defines import NETWORK_MODE_LTE_CDMA_EVDO
-from acts_contrib.test_utils.tel.tel_defines import RAT_1XRTT
-from acts_contrib.test_utils.tel.tel_defines import RAT_GSM
-from acts_contrib.test_utils.tel.tel_defines import RAT_LTE
-from acts_contrib.test_utils.tel.tel_defines import RAT_WCDMA
-from acts_contrib.test_utils.tel.tel_defines import RAT_FAMILY_CDMA2000
-from acts_contrib.test_utils.tel.tel_defines import RAT_FAMILY_GSM
-from acts_contrib.test_utils.tel.tel_defines import RAT_FAMILY_LTE
-from acts_contrib.test_utils.tel.tel_defines import RAT_FAMILY_UMTS
-from acts_contrib.test_utils.tel.tel_defines import NETWORK_SERVICE_DATA
-from acts_contrib.test_utils.tel.tel_defines import GEN_4G
-from acts_contrib.test_utils.tel.tel_defines import POWER_LEVEL_OUT_OF_SERVICE
-from acts_contrib.test_utils.tel.tel_defines import POWER_LEVEL_FULL_SERVICE
-from acts_contrib.test_utils.tel.tel_test_utils import ensure_network_rat
-from acts_contrib.test_utils.tel.tel_test_utils import ensure_phones_idle
-from acts_contrib.test_utils.tel.tel_test_utils import ensure_network_generation
-from acts_contrib.test_utils.tel.tel_test_utils import get_host_ip_address
-from acts_contrib.test_utils.tel.tel_test_utils import toggle_airplane_mode
-from acts_contrib.test_utils.tel.tel_test_utils import iperf_test_by_adb
-from acts_contrib.test_utils.tel.tel_test_utils import start_qxdm_loggers
-from acts_contrib.test_utils.tel.tel_test_utils import verify_http_connection
-from acts_contrib.test_utils.tel.tel_test_utils import check_data_stall_detection
-from acts_contrib.test_utils.tel.tel_test_utils import check_network_validation_fail
-from acts_contrib.test_utils.tel.tel_test_utils import check_data_stall_recovery
-from acts_contrib.test_utils.tel.tel_test_utils import get_device_epoch_time
-from acts_contrib.test_utils.tel.tel_test_utils import break_internet_except_sl4a_port
-from acts_contrib.test_utils.tel.tel_test_utils import resume_internet_with_sl4a_port
-from acts_contrib.test_utils.tel.tel_test_utils import \
+from acts.test_utils.tel.anritsu_utils import cb_serial_number
+from acts.test_utils.tel.anritsu_utils import set_system_model_1x
+from acts.test_utils.tel.anritsu_utils import set_system_model_gsm
+from acts.test_utils.tel.anritsu_utils import set_system_model_lte
+from acts.test_utils.tel.anritsu_utils import set_system_model_lte_wcdma
+from acts.test_utils.tel.anritsu_utils import set_system_model_wcdma
+from acts.test_utils.tel.anritsu_utils import sms_mo_send
+from acts.test_utils.tel.anritsu_utils import sms_mt_receive_verify
+from acts.test_utils.tel.anritsu_utils import set_usim_parameters
+from acts.test_utils.tel.anritsu_utils import set_post_sim_params
+from acts.test_utils.tel.tel_defines import DIRECTION_MOBILE_ORIGINATED
+from acts.test_utils.tel.tel_defines import DIRECTION_MOBILE_TERMINATED
+from acts.test_utils.tel.tel_defines import NETWORK_MODE_CDMA
+from acts.test_utils.tel.tel_defines import NETWORK_MODE_GSM_ONLY
+from acts.test_utils.tel.tel_defines import NETWORK_MODE_GSM_UMTS
+from acts.test_utils.tel.tel_defines import NETWORK_MODE_LTE_GSM_WCDMA
+from acts.test_utils.tel.tel_defines import NETWORK_MODE_LTE_CDMA_EVDO
+from acts.test_utils.tel.tel_defines import RAT_1XRTT
+from acts.test_utils.tel.tel_defines import RAT_GSM
+from acts.test_utils.tel.tel_defines import RAT_LTE
+from acts.test_utils.tel.tel_defines import RAT_WCDMA
+from acts.test_utils.tel.tel_defines import RAT_FAMILY_CDMA2000
+from acts.test_utils.tel.tel_defines import RAT_FAMILY_GSM
+from acts.test_utils.tel.tel_defines import RAT_FAMILY_LTE
+from acts.test_utils.tel.tel_defines import RAT_FAMILY_UMTS
+from acts.test_utils.tel.tel_defines import NETWORK_SERVICE_DATA
+from acts.test_utils.tel.tel_defines import GEN_4G
+from acts.test_utils.tel.tel_defines import POWER_LEVEL_OUT_OF_SERVICE
+from acts.test_utils.tel.tel_defines import POWER_LEVEL_FULL_SERVICE
+from acts.test_utils.tel.tel_test_utils import ensure_network_rat
+from acts.test_utils.tel.tel_test_utils import ensure_phones_idle
+from acts.test_utils.tel.tel_test_utils import ensure_network_generation
+from acts.test_utils.tel.tel_test_utils import get_host_ip_address
+from acts.test_utils.tel.tel_test_utils import toggle_airplane_mode
+from acts.test_utils.tel.tel_test_utils import iperf_test_by_adb
+from acts.test_utils.tel.tel_test_utils import start_qxdm_loggers
+from acts.test_utils.tel.tel_test_utils import verify_http_connection
+from acts.test_utils.tel.tel_test_utils import check_data_stall_detection
+from acts.test_utils.tel.tel_test_utils import check_network_validation_fail
+from acts.test_utils.tel.tel_test_utils import check_data_stall_recovery
+from acts.test_utils.tel.tel_test_utils import get_device_epoch_time
+from acts.test_utils.tel.tel_test_utils import break_internet_except_sl4a_port
+from acts.test_utils.tel.tel_test_utils import resume_internet_with_sl4a_port
+from acts.test_utils.tel.tel_test_utils import \
test_data_browsing_success_using_sl4a
-from acts_contrib.test_utils.tel.tel_test_utils import \
+from acts.test_utils.tel.tel_test_utils import \
test_data_browsing_failure_using_sl4a
-from acts_contrib.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
+from acts.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
from acts.utils import adb_shell_ping
from acts.utils import rand_ascii_str
from acts.controllers import iperf_server
diff --git a/acts_tests/tests/google/tel/lab/TelLabEmergencyCallTest.py b/acts_tests/tests/google/tel/lab/TelLabEmergencyCallTest.py
index d83faa3..4ea6e7f 100644
--- a/acts_tests/tests/google/tel/lab/TelLabEmergencyCallTest.py
+++ b/acts_tests/tests/google/tel/lab/TelLabEmergencyCallTest.py
@@ -23,47 +23,47 @@
from acts.controllers.anritsu_lib.md8475a import MD8475A
from acts.controllers.anritsu_lib.md8475a import VirtualPhoneAutoAnswer
from acts.controllers.anritsu_lib.md8475a import VirtualPhoneStatus
-from acts_contrib.test_utils.tel.anritsu_utils import WAIT_TIME_ANRITSU_REG_AND_CALL
-from acts_contrib.test_utils.tel.anritsu_utils import call_mo_setup_teardown
-from acts_contrib.test_utils.tel.anritsu_utils import ims_call_cs_teardown
-from acts_contrib.test_utils.tel.anritsu_utils import call_mt_setup_teardown
-from acts_contrib.test_utils.tel.anritsu_utils import set_system_model_1x
-from acts_contrib.test_utils.tel.anritsu_utils import set_system_model_1x_evdo
-from acts_contrib.test_utils.tel.anritsu_utils import set_system_model_gsm
-from acts_contrib.test_utils.tel.anritsu_utils import set_system_model_lte
-from acts_contrib.test_utils.tel.anritsu_utils import set_system_model_lte_1x
-from acts_contrib.test_utils.tel.anritsu_utils import set_system_model_lte_wcdma
-from acts_contrib.test_utils.tel.anritsu_utils import set_system_model_lte_gsm
-from acts_contrib.test_utils.tel.anritsu_utils import set_system_model_wcdma
-from acts_contrib.test_utils.tel.anritsu_utils import set_usim_parameters
-from acts_contrib.test_utils.tel.anritsu_utils import set_post_sim_params
-from acts_contrib.test_utils.tel.tel_defines import CALL_TEARDOWN_PHONE
-from acts_contrib.test_utils.tel.tel_defines import DEFAULT_EMERGENCY_CALL_NUMBER
-from acts_contrib.test_utils.tel.tel_defines import EMERGENCY_CALL_NUMBERS
-from acts_contrib.test_utils.tel.tel_defines import RAT_FAMILY_CDMA2000
-from acts_contrib.test_utils.tel.tel_defines import RAT_FAMILY_GSM
-from acts_contrib.test_utils.tel.tel_defines import RAT_FAMILY_LTE
-from acts_contrib.test_utils.tel.tel_defines import RAT_FAMILY_UMTS
-from acts_contrib.test_utils.tel.tel_defines import RAT_1XRTT
-from acts_contrib.test_utils.tel.tel_defines import NETWORK_MODE_CDMA
-from acts_contrib.test_utils.tel.tel_defines import NETWORK_MODE_GSM_ONLY
-from acts_contrib.test_utils.tel.tel_defines import NETWORK_MODE_GSM_UMTS
-from acts_contrib.test_utils.tel.tel_defines import NETWORK_MODE_LTE_CDMA_EVDO
-from acts_contrib.test_utils.tel.tel_defines import NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA
-from acts_contrib.test_utils.tel.tel_defines import NETWORK_MODE_LTE_GSM_WCDMA
-from acts_contrib.test_utils.tel.tel_defines import WAIT_TIME_IN_CALL
-from acts_contrib.test_utils.tel.tel_defines import WAIT_TIME_IN_CALL_FOR_IMS
-from acts_contrib.test_utils.tel.tel_test_utils import ensure_network_rat
-from acts_contrib.test_utils.tel.tel_test_utils import ensure_phone_default_state
-from acts_contrib.test_utils.tel.tel_test_utils import ensure_phones_idle
-from acts_contrib.test_utils.tel.tel_test_utils import toggle_airplane_mode_by_adb
-from acts_contrib.test_utils.tel.tel_test_utils import toggle_volte
-from acts_contrib.test_utils.tel.tel_test_utils import check_apm_mode_on_by_serial
-from acts_contrib.test_utils.tel.tel_test_utils import set_apm_mode_on_by_serial
-from acts_contrib.test_utils.tel.tel_test_utils import set_preferred_apn_by_adb
-from acts_contrib.test_utils.tel.tel_test_utils import start_qxdm_loggers
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_idle_volte
-from acts_contrib.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
+from acts.test_utils.tel.anritsu_utils import WAIT_TIME_ANRITSU_REG_AND_CALL
+from acts.test_utils.tel.anritsu_utils import call_mo_setup_teardown
+from acts.test_utils.tel.anritsu_utils import ims_call_cs_teardown
+from acts.test_utils.tel.anritsu_utils import call_mt_setup_teardown
+from acts.test_utils.tel.anritsu_utils import set_system_model_1x
+from acts.test_utils.tel.anritsu_utils import set_system_model_1x_evdo
+from acts.test_utils.tel.anritsu_utils import set_system_model_gsm
+from acts.test_utils.tel.anritsu_utils import set_system_model_lte
+from acts.test_utils.tel.anritsu_utils import set_system_model_lte_1x
+from acts.test_utils.tel.anritsu_utils import set_system_model_lte_wcdma
+from acts.test_utils.tel.anritsu_utils import set_system_model_lte_gsm
+from acts.test_utils.tel.anritsu_utils import set_system_model_wcdma
+from acts.test_utils.tel.anritsu_utils import set_usim_parameters
+from acts.test_utils.tel.anritsu_utils import set_post_sim_params
+from acts.test_utils.tel.tel_defines import CALL_TEARDOWN_PHONE
+from acts.test_utils.tel.tel_defines import DEFAULT_EMERGENCY_CALL_NUMBER
+from acts.test_utils.tel.tel_defines import EMERGENCY_CALL_NUMBERS
+from acts.test_utils.tel.tel_defines import RAT_FAMILY_CDMA2000
+from acts.test_utils.tel.tel_defines import RAT_FAMILY_GSM
+from acts.test_utils.tel.tel_defines import RAT_FAMILY_LTE
+from acts.test_utils.tel.tel_defines import RAT_FAMILY_UMTS
+from acts.test_utils.tel.tel_defines import RAT_1XRTT
+from acts.test_utils.tel.tel_defines import NETWORK_MODE_CDMA
+from acts.test_utils.tel.tel_defines import NETWORK_MODE_GSM_ONLY
+from acts.test_utils.tel.tel_defines import NETWORK_MODE_GSM_UMTS
+from acts.test_utils.tel.tel_defines import NETWORK_MODE_LTE_CDMA_EVDO
+from acts.test_utils.tel.tel_defines import NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA
+from acts.test_utils.tel.tel_defines import NETWORK_MODE_LTE_GSM_WCDMA
+from acts.test_utils.tel.tel_defines import WAIT_TIME_IN_CALL
+from acts.test_utils.tel.tel_defines import WAIT_TIME_IN_CALL_FOR_IMS
+from acts.test_utils.tel.tel_test_utils import ensure_network_rat
+from acts.test_utils.tel.tel_test_utils import ensure_phone_default_state
+from acts.test_utils.tel.tel_test_utils import ensure_phones_idle
+from acts.test_utils.tel.tel_test_utils import toggle_airplane_mode_by_adb
+from acts.test_utils.tel.tel_test_utils import toggle_volte
+from acts.test_utils.tel.tel_test_utils import check_apm_mode_on_by_serial
+from acts.test_utils.tel.tel_test_utils import set_apm_mode_on_by_serial
+from acts.test_utils.tel.tel_test_utils import set_preferred_apn_by_adb
+from acts.test_utils.tel.tel_test_utils import start_qxdm_loggers
+from acts.test_utils.tel.tel_voice_utils import phone_idle_volte
+from acts.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
from acts.test_decorators import test_tracker_info
from acts.utils import exe_cmd
diff --git a/acts_tests/tests/google/tel/lab/TelLabEtwsTest.py b/acts_tests/tests/google/tel/lab/TelLabEtwsTest.py
index 3683173..1a1fbf9 100644
--- a/acts_tests/tests/google/tel/lab/TelLabEtwsTest.py
+++ b/acts_tests/tests/google/tel/lab/TelLabEtwsTest.py
@@ -22,32 +22,32 @@
from acts.controllers.anritsu_lib.md8475a import MD8475A
from acts.controllers.anritsu_lib.md8475a import CBCHSetup
from acts.controllers.anritsu_lib.md8475a import CTCHSetup
-from acts_contrib.test_utils.tel.anritsu_utils import ETWS_WARNING_EARTHQUAKETSUNAMI
-from acts_contrib.test_utils.tel.anritsu_utils import ETWS_WARNING_OTHER_EMERGENCY
-from acts_contrib.test_utils.tel.anritsu_utils import cb_serial_number
-from acts_contrib.test_utils.tel.anritsu_utils import etws_receive_verify_message_lte_wcdma
-from acts_contrib.test_utils.tel.anritsu_utils import set_system_model_gsm
-from acts_contrib.test_utils.tel.anritsu_utils import set_system_model_lte
-from acts_contrib.test_utils.tel.anritsu_utils import set_system_model_wcdma
-from acts_contrib.test_utils.tel.anritsu_utils import set_usim_parameters
-from acts_contrib.test_utils.tel.anritsu_utils import set_post_sim_params
-from acts_contrib.test_utils.tel.tel_defines import NETWORK_MODE_CDMA
-from acts_contrib.test_utils.tel.tel_defines import NETWORK_MODE_GSM_ONLY
-from acts_contrib.test_utils.tel.tel_defines import NETWORK_MODE_GSM_UMTS
-from acts_contrib.test_utils.tel.tel_defines import NETWORK_MODE_LTE_GSM_WCDMA
-from acts_contrib.test_utils.tel.tel_defines import RAT_1XRTT
-from acts_contrib.test_utils.tel.tel_defines import RAT_GSM
-from acts_contrib.test_utils.tel.tel_defines import RAT_LTE
-from acts_contrib.test_utils.tel.tel_defines import RAT_WCDMA
-from acts_contrib.test_utils.tel.tel_defines import RAT_FAMILY_CDMA2000
-from acts_contrib.test_utils.tel.tel_defines import RAT_FAMILY_GSM
-from acts_contrib.test_utils.tel.tel_defines import RAT_FAMILY_LTE
-from acts_contrib.test_utils.tel.tel_defines import RAT_FAMILY_UMTS
-from acts_contrib.test_utils.tel.tel_test_utils import ensure_network_rat
-from acts_contrib.test_utils.tel.tel_test_utils import ensure_phones_idle
-from acts_contrib.test_utils.tel.tel_test_utils import toggle_airplane_mode
-from acts_contrib.test_utils.tel.tel_test_utils import start_qxdm_loggers
-from acts_contrib.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
+from acts.test_utils.tel.anritsu_utils import ETWS_WARNING_EARTHQUAKETSUNAMI
+from acts.test_utils.tel.anritsu_utils import ETWS_WARNING_OTHER_EMERGENCY
+from acts.test_utils.tel.anritsu_utils import cb_serial_number
+from acts.test_utils.tel.anritsu_utils import etws_receive_verify_message_lte_wcdma
+from acts.test_utils.tel.anritsu_utils import set_system_model_gsm
+from acts.test_utils.tel.anritsu_utils import set_system_model_lte
+from acts.test_utils.tel.anritsu_utils import set_system_model_wcdma
+from acts.test_utils.tel.anritsu_utils import set_usim_parameters
+from acts.test_utils.tel.anritsu_utils import set_post_sim_params
+from acts.test_utils.tel.tel_defines import NETWORK_MODE_CDMA
+from acts.test_utils.tel.tel_defines import NETWORK_MODE_GSM_ONLY
+from acts.test_utils.tel.tel_defines import NETWORK_MODE_GSM_UMTS
+from acts.test_utils.tel.tel_defines import NETWORK_MODE_LTE_GSM_WCDMA
+from acts.test_utils.tel.tel_defines import RAT_1XRTT
+from acts.test_utils.tel.tel_defines import RAT_GSM
+from acts.test_utils.tel.tel_defines import RAT_LTE
+from acts.test_utils.tel.tel_defines import RAT_WCDMA
+from acts.test_utils.tel.tel_defines import RAT_FAMILY_CDMA2000
+from acts.test_utils.tel.tel_defines import RAT_FAMILY_GSM
+from acts.test_utils.tel.tel_defines import RAT_FAMILY_LTE
+from acts.test_utils.tel.tel_defines import RAT_FAMILY_UMTS
+from acts.test_utils.tel.tel_test_utils import ensure_network_rat
+from acts.test_utils.tel.tel_test_utils import ensure_phones_idle
+from acts.test_utils.tel.tel_test_utils import toggle_airplane_mode
+from acts.test_utils.tel.tel_test_utils import start_qxdm_loggers
+from acts.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
from acts.test_decorators import test_tracker_info
WAIT_TIME_BETWEEN_REG_AND_MSG = 15 # default 15 sec
diff --git a/acts_tests/tests/google/tel/lab/TelLabMobilityTest.py b/acts_tests/tests/google/tel/lab/TelLabMobilityTest.py
index aba648b..f620826 100644
--- a/acts_tests/tests/google/tel/lab/TelLabMobilityTest.py
+++ b/acts_tests/tests/google/tel/lab/TelLabMobilityTest.py
@@ -22,42 +22,42 @@
from acts.controllers.anritsu_lib._anritsu_utils import AnritsuError
from acts.controllers.anritsu_lib.md8475a import MD8475A
from acts.controllers.anritsu_lib.md8475a import BtsNumber
-from acts_contrib.test_utils.tel.anritsu_utils import WAIT_TIME_ANRITSU_REG_AND_CALL
-from acts_contrib.test_utils.tel.anritsu_utils import handover_tc
-from acts_contrib.test_utils.tel.anritsu_utils import make_ims_call
-from acts_contrib.test_utils.tel.anritsu_utils import tear_down_call
-from acts_contrib.test_utils.tel.anritsu_utils import set_system_model_lte_lte
-from acts_contrib.test_utils.tel.anritsu_utils import set_system_model_lte_wcdma
-from acts_contrib.test_utils.tel.anritsu_utils import set_system_model_lte_gsm
-from acts_contrib.test_utils.tel.anritsu_utils import set_system_model_lte_1x
-from acts_contrib.test_utils.tel.anritsu_utils import set_system_model_lte_evdo
-from acts_contrib.test_utils.tel.anritsu_utils import set_usim_parameters
-from acts_contrib.test_utils.tel.anritsu_utils import set_post_sim_params
-from acts_contrib.test_utils.tel.tel_defines import CALL_TEARDOWN_PHONE
-from acts_contrib.test_utils.tel.tel_defines import RAT_FAMILY_CDMA2000
-from acts_contrib.test_utils.tel.tel_defines import RAT_FAMILY_GSM
-from acts_contrib.test_utils.tel.tel_defines import RAT_FAMILY_LTE
-from acts_contrib.test_utils.tel.tel_defines import RAT_FAMILY_UMTS
-from acts_contrib.test_utils.tel.tel_defines import RAT_1XRTT
-from acts_contrib.test_utils.tel.tel_defines import NETWORK_MODE_CDMA
-from acts_contrib.test_utils.tel.tel_defines import NETWORK_MODE_GSM_ONLY
-from acts_contrib.test_utils.tel.tel_defines import NETWORK_MODE_GSM_UMTS
-from acts_contrib.test_utils.tel.tel_defines import NETWORK_MODE_LTE_CDMA_EVDO
-from acts_contrib.test_utils.tel.tel_defines import NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA
-from acts_contrib.test_utils.tel.tel_defines import NETWORK_MODE_LTE_GSM_WCDMA
-from acts_contrib.test_utils.tel.tel_defines import WAIT_TIME_IN_CALL
-from acts_contrib.test_utils.tel.tel_defines import WAIT_TIME_IN_CALL_FOR_IMS
-from acts_contrib.test_utils.tel.tel_test_utils import ensure_network_rat
-from acts_contrib.test_utils.tel.tel_test_utils import ensure_phones_idle
-from acts_contrib.test_utils.tel.tel_test_utils import get_host_ip_address
-from acts_contrib.test_utils.tel.tel_test_utils import toggle_airplane_mode_by_adb
-from acts_contrib.test_utils.tel.tel_test_utils import toggle_volte
-from acts_contrib.test_utils.tel.tel_test_utils import run_multithread_func
-from acts_contrib.test_utils.tel.tel_test_utils import iperf_test_by_adb
-from acts_contrib.test_utils.tel.tel_test_utils import set_preferred_apn_by_adb
-from acts_contrib.test_utils.tel.tel_test_utils import start_qxdm_loggers
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_idle_volte
-from acts_contrib.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
+from acts.test_utils.tel.anritsu_utils import WAIT_TIME_ANRITSU_REG_AND_CALL
+from acts.test_utils.tel.anritsu_utils import handover_tc
+from acts.test_utils.tel.anritsu_utils import make_ims_call
+from acts.test_utils.tel.anritsu_utils import tear_down_call
+from acts.test_utils.tel.anritsu_utils import set_system_model_lte_lte
+from acts.test_utils.tel.anritsu_utils import set_system_model_lte_wcdma
+from acts.test_utils.tel.anritsu_utils import set_system_model_lte_gsm
+from acts.test_utils.tel.anritsu_utils import set_system_model_lte_1x
+from acts.test_utils.tel.anritsu_utils import set_system_model_lte_evdo
+from acts.test_utils.tel.anritsu_utils import set_usim_parameters
+from acts.test_utils.tel.anritsu_utils import set_post_sim_params
+from acts.test_utils.tel.tel_defines import CALL_TEARDOWN_PHONE
+from acts.test_utils.tel.tel_defines import RAT_FAMILY_CDMA2000
+from acts.test_utils.tel.tel_defines import RAT_FAMILY_GSM
+from acts.test_utils.tel.tel_defines import RAT_FAMILY_LTE
+from acts.test_utils.tel.tel_defines import RAT_FAMILY_UMTS
+from acts.test_utils.tel.tel_defines import RAT_1XRTT
+from acts.test_utils.tel.tel_defines import NETWORK_MODE_CDMA
+from acts.test_utils.tel.tel_defines import NETWORK_MODE_GSM_ONLY
+from acts.test_utils.tel.tel_defines import NETWORK_MODE_GSM_UMTS
+from acts.test_utils.tel.tel_defines import NETWORK_MODE_LTE_CDMA_EVDO
+from acts.test_utils.tel.tel_defines import NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA
+from acts.test_utils.tel.tel_defines import NETWORK_MODE_LTE_GSM_WCDMA
+from acts.test_utils.tel.tel_defines import WAIT_TIME_IN_CALL
+from acts.test_utils.tel.tel_defines import WAIT_TIME_IN_CALL_FOR_IMS
+from acts.test_utils.tel.tel_test_utils import ensure_network_rat
+from acts.test_utils.tel.tel_test_utils import ensure_phones_idle
+from acts.test_utils.tel.tel_test_utils import get_host_ip_address
+from acts.test_utils.tel.tel_test_utils import toggle_airplane_mode_by_adb
+from acts.test_utils.tel.tel_test_utils import toggle_volte
+from acts.test_utils.tel.tel_test_utils import run_multithread_func
+from acts.test_utils.tel.tel_test_utils import iperf_test_by_adb
+from acts.test_utils.tel.tel_test_utils import set_preferred_apn_by_adb
+from acts.test_utils.tel.tel_test_utils import start_qxdm_loggers
+from acts.test_utils.tel.tel_voice_utils import phone_idle_volte
+from acts.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
from acts.utils import adb_shell_ping
from acts.utils import rand_ascii_str
from acts.controllers import iperf_server
diff --git a/acts_tests/tests/google/tel/lab/TelLabNeighborCellTest.py b/acts_tests/tests/google/tel/lab/TelLabNeighborCellTest.py
index 8690ae7..ae3ac1d 100644
--- a/acts_tests/tests/google/tel/lab/TelLabNeighborCellTest.py
+++ b/acts_tests/tests/google/tel/lab/TelLabNeighborCellTest.py
@@ -27,27 +27,27 @@
from acts.controllers.anritsu_lib.md8475a import BtsServiceState
from acts.controllers.anritsu_lib.md8475a import MD8475A
from acts.controllers.anritsu_lib.mg3710a import MG3710A
-from acts_contrib.test_utils.tel.anritsu_utils import LTE_BAND_2
-from acts_contrib.test_utils.tel.anritsu_utils import set_system_model_gsm
-from acts_contrib.test_utils.tel.anritsu_utils import set_system_model_lte
-from acts_contrib.test_utils.tel.anritsu_utils import set_system_model_lte_lte
-from acts_contrib.test_utils.tel.anritsu_utils import set_system_model_lte_wcdma
-from acts_contrib.test_utils.tel.anritsu_utils import set_system_model_wcdma
-from acts_contrib.test_utils.tel.anritsu_utils import set_system_model_wcdma_gsm
-from acts_contrib.test_utils.tel.anritsu_utils import set_system_model_wcdma_wcdma
-from acts_contrib.test_utils.tel.anritsu_utils import set_usim_parameters
-from acts_contrib.test_utils.tel.tel_defines import NETWORK_MODE_CDMA
-from acts_contrib.test_utils.tel.tel_defines import NETWORK_MODE_GSM_ONLY
-from acts_contrib.test_utils.tel.tel_defines import NETWORK_MODE_GSM_UMTS
-from acts_contrib.test_utils.tel.tel_defines import NETWORK_MODE_LTE_GSM_WCDMA
-from acts_contrib.test_utils.tel.tel_defines import RAT_FAMILY_CDMA2000
-from acts_contrib.test_utils.tel.tel_defines import RAT_FAMILY_GSM
-from acts_contrib.test_utils.tel.tel_defines import RAT_FAMILY_LTE
-from acts_contrib.test_utils.tel.tel_defines import RAT_FAMILY_UMTS
-from acts_contrib.test_utils.tel.tel_test_utils import ensure_network_rat
-from acts_contrib.test_utils.tel.tel_test_utils import ensure_phones_idle
-from acts_contrib.test_utils.tel.tel_test_utils import toggle_airplane_mode
-from acts_contrib.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
+from acts.test_utils.tel.anritsu_utils import LTE_BAND_2
+from acts.test_utils.tel.anritsu_utils import set_system_model_gsm
+from acts.test_utils.tel.anritsu_utils import set_system_model_lte
+from acts.test_utils.tel.anritsu_utils import set_system_model_lte_lte
+from acts.test_utils.tel.anritsu_utils import set_system_model_lte_wcdma
+from acts.test_utils.tel.anritsu_utils import set_system_model_wcdma
+from acts.test_utils.tel.anritsu_utils import set_system_model_wcdma_gsm
+from acts.test_utils.tel.anritsu_utils import set_system_model_wcdma_wcdma
+from acts.test_utils.tel.anritsu_utils import set_usim_parameters
+from acts.test_utils.tel.tel_defines import NETWORK_MODE_CDMA
+from acts.test_utils.tel.tel_defines import NETWORK_MODE_GSM_ONLY
+from acts.test_utils.tel.tel_defines import NETWORK_MODE_GSM_UMTS
+from acts.test_utils.tel.tel_defines import NETWORK_MODE_LTE_GSM_WCDMA
+from acts.test_utils.tel.tel_defines import RAT_FAMILY_CDMA2000
+from acts.test_utils.tel.tel_defines import RAT_FAMILY_GSM
+from acts.test_utils.tel.tel_defines import RAT_FAMILY_LTE
+from acts.test_utils.tel.tel_defines import RAT_FAMILY_UMTS
+from acts.test_utils.tel.tel_test_utils import ensure_network_rat
+from acts.test_utils.tel.tel_test_utils import ensure_phones_idle
+from acts.test_utils.tel.tel_test_utils import toggle_airplane_mode
+from acts.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
from acts.controllers.anritsu_lib.cell_configurations import \
gsm_band850_ch128_fr869_cid58_cell
from acts.controllers.anritsu_lib.cell_configurations import \
diff --git a/acts_tests/tests/google/tel/lab/TelLabProjectFiTest.py b/acts_tests/tests/google/tel/lab/TelLabProjectFiTest.py
index 4208689..b5ccd08 100644
--- a/acts_tests/tests/google/tel/lab/TelLabProjectFiTest.py
+++ b/acts_tests/tests/google/tel/lab/TelLabProjectFiTest.py
@@ -21,37 +21,37 @@
from acts.controllers.anritsu_lib.md8475a import CBCHSetup
from acts.controllers.anritsu_lib.md8475a import CTCHSetup
from acts.controllers.anritsu_lib.md8475a import MD8475A
-from acts_contrib.test_utils.tel.anritsu_utils import cb_serial_number
-from acts_contrib.test_utils.tel.anritsu_utils import set_system_model_lte
-from acts_contrib.test_utils.tel.anritsu_utils import set_usim_parameters
-from acts_contrib.test_utils.tel.anritsu_utils import set_post_sim_params
-from acts_contrib.test_utils.tel.tel_test_utils import \
+from acts.test_utils.tel.anritsu_utils import cb_serial_number
+from acts.test_utils.tel.anritsu_utils import set_system_model_lte
+from acts.test_utils.tel.anritsu_utils import set_usim_parameters
+from acts.test_utils.tel.anritsu_utils import set_post_sim_params
+from acts.test_utils.tel.tel_test_utils import \
ensure_preferred_network_type_for_subscription
-from acts_contrib.test_utils.tel.tel_test_utils import ensure_phones_idle
-from acts_contrib.test_utils.tel.tel_test_utils import toggle_airplane_mode
-from acts_contrib.test_utils.tel.tel_test_utils import start_qxdm_loggers
-from acts_contrib.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
-from acts_contrib.test_utils.tel.tel_defines import NETWORK_MODE_LTE_GSM_WCDMA
-from acts_contrib.test_utils.tel.tel_defines import RAT_FAMILY_LTE
+from acts.test_utils.tel.tel_test_utils import ensure_phones_idle
+from acts.test_utils.tel.tel_test_utils import toggle_airplane_mode
+from acts.test_utils.tel.tel_test_utils import start_qxdm_loggers
+from acts.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
+from acts.test_utils.tel.tel_defines import NETWORK_MODE_LTE_GSM_WCDMA
+from acts.test_utils.tel.tel_defines import RAT_FAMILY_LTE
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.tel.tel_defines import RAT_LTE
-from acts_contrib.test_utils.tel.tel_defines import CARRIER_SPT
-from acts_contrib.test_utils.tel.tel_defines import CARRIER_TMO
-from acts_contrib.test_utils.tel.tel_defines import CARRIER_USCC
-from acts_contrib.test_utils.tel.tel_lookup_tables import operator_name_from_plmn_id
-from acts_contrib.test_utils.tel.tel_test_utils import abort_all_tests
-from acts_contrib.test_utils.tel.tel_test_utils import ensure_phone_subscription
-from acts_contrib.test_utils.tel.tel_test_utils import ensure_wifi_connected
-from acts_contrib.test_utils.tel.tel_test_utils import is_sim_ready
-from acts_contrib.test_utils.tel.tel_test_utils import log_screen_shot
-from acts_contrib.test_utils.tel.tel_test_utils import multithread_func
-from acts_contrib.test_utils.tel.tel_test_utils import reboot_device
-from acts_contrib.test_utils.tel.tel_test_utils import refresh_droid_config
-from acts_contrib.test_utils.tel.tel_test_utils import send_dialer_secret_code
-from acts_contrib.test_utils.tel.tel_test_utils import toggle_airplane_mode_by_adb
-from acts_contrib.test_utils.tel.tel_test_utils import wait_for_state
-from acts_contrib.test_utils.tel.tel_test_utils import add_google_account
-from acts_contrib.test_utils.tel.tel_test_utils import remove_google_account
+from acts.test_utils.tel.tel_defines import RAT_LTE
+from acts.test_utils.tel.tel_defines import CARRIER_SPT
+from acts.test_utils.tel.tel_defines import CARRIER_TMO
+from acts.test_utils.tel.tel_defines import CARRIER_USCC
+from acts.test_utils.tel.tel_lookup_tables import operator_name_from_plmn_id
+from acts.test_utils.tel.tel_test_utils import abort_all_tests
+from acts.test_utils.tel.tel_test_utils import ensure_phone_subscription
+from acts.test_utils.tel.tel_test_utils import ensure_wifi_connected
+from acts.test_utils.tel.tel_test_utils import is_sim_ready
+from acts.test_utils.tel.tel_test_utils import log_screen_shot
+from acts.test_utils.tel.tel_test_utils import multithread_func
+from acts.test_utils.tel.tel_test_utils import reboot_device
+from acts.test_utils.tel.tel_test_utils import refresh_droid_config
+from acts.test_utils.tel.tel_test_utils import send_dialer_secret_code
+from acts.test_utils.tel.tel_test_utils import toggle_airplane_mode_by_adb
+from acts.test_utils.tel.tel_test_utils import wait_for_state
+from acts.test_utils.tel.tel_test_utils import add_google_account
+from acts.test_utils.tel.tel_test_utils import remove_google_account
WAIT_TIME_BETWEEN_REG_AND_MSG = 15 # default 15 sec
CARRIER = None
diff --git a/acts_tests/tests/google/tel/lab/TelLabSmsTest.py b/acts_tests/tests/google/tel/lab/TelLabSmsTest.py
index 2f2bc68..47270c9 100644
--- a/acts_tests/tests/google/tel/lab/TelLabSmsTest.py
+++ b/acts_tests/tests/google/tel/lab/TelLabSmsTest.py
@@ -22,45 +22,45 @@
from acts.controllers.anritsu_lib._anritsu_utils import AnritsuError
from acts.controllers.anritsu_lib.md8475a import MD8475A
from acts.controllers.anritsu_lib.md8475a import VirtualPhoneStatus
-from acts_contrib.test_utils.tel.anritsu_utils import set_system_model_1x
-from acts_contrib.test_utils.tel.anritsu_utils import set_system_model_gsm
-from acts_contrib.test_utils.tel.anritsu_utils import set_system_model_lte
-from acts_contrib.test_utils.tel.anritsu_utils import set_system_model_wcdma
-from acts_contrib.test_utils.tel.anritsu_utils import sms_mo_send
-from acts_contrib.test_utils.tel.anritsu_utils import sms_mt_receive_verify
-from acts_contrib.test_utils.tel.anritsu_utils import set_usim_parameters
-from acts_contrib.test_utils.tel.anritsu_utils import set_post_sim_params
-from acts_contrib.test_utils.tel.tel_defines import DIRECTION_MOBILE_ORIGINATED
-from acts_contrib.test_utils.tel.tel_defines import DIRECTION_MOBILE_TERMINATED
-from acts_contrib.test_utils.tel.tel_defines import NETWORK_MODE_CDMA
-from acts_contrib.test_utils.tel.tel_defines import NETWORK_MODE_GSM_ONLY
-from acts_contrib.test_utils.tel.tel_defines import NETWORK_MODE_GSM_UMTS
-from acts_contrib.test_utils.tel.tel_defines import NETWORK_MODE_LTE_GSM_WCDMA
-from acts_contrib.test_utils.tel.tel_defines import RAT_1XRTT
-from acts_contrib.test_utils.tel.tel_defines import RAT_GSM
-from acts_contrib.test_utils.tel.tel_defines import RAT_LTE
-from acts_contrib.test_utils.tel.tel_defines import RAT_WCDMA
-from acts_contrib.test_utils.tel.tel_defines import RAT_FAMILY_CDMA2000
-from acts_contrib.test_utils.tel.tel_defines import RAT_FAMILY_GSM
-from acts_contrib.test_utils.tel.tel_defines import RAT_FAMILY_LTE
-from acts_contrib.test_utils.tel.tel_defines import RAT_FAMILY_UMTS
-from acts_contrib.test_utils.tel.tel_test_utils import ensure_network_rat
-from acts_contrib.test_utils.tel.tel_test_utils import ensure_phones_idle
-from acts_contrib.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
-from acts_contrib.test_utils.tel.tel_test_utils import toggle_volte
-from acts_contrib.test_utils.tel.tel_test_utils import set_preferred_apn_by_adb
-from acts_contrib.test_utils.tel.tel_defines import CALL_TEARDOWN_PHONE
-from acts_contrib.test_utils.tel.tel_defines import RAT_FAMILY_CDMA2000
-from acts_contrib.test_utils.tel.tel_defines import RAT_FAMILY_GSM
-from acts_contrib.test_utils.tel.tel_defines import RAT_FAMILY_LTE
-from acts_contrib.test_utils.tel.tel_defines import RAT_FAMILY_UMTS
-from acts_contrib.test_utils.tel.tel_defines import RAT_1XRTT
-from acts_contrib.test_utils.tel.tel_defines import NETWORK_MODE_CDMA
-from acts_contrib.test_utils.tel.tel_defines import NETWORK_MODE_GSM_ONLY
-from acts_contrib.test_utils.tel.tel_defines import NETWORK_MODE_GSM_UMTS
-from acts_contrib.test_utils.tel.tel_defines import NETWORK_MODE_LTE_CDMA_EVDO
-from acts_contrib.test_utils.tel.tel_defines import NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA
-from acts_contrib.test_utils.tel.tel_defines import NETWORK_MODE_LTE_GSM_WCDMA
+from acts.test_utils.tel.anritsu_utils import set_system_model_1x
+from acts.test_utils.tel.anritsu_utils import set_system_model_gsm
+from acts.test_utils.tel.anritsu_utils import set_system_model_lte
+from acts.test_utils.tel.anritsu_utils import set_system_model_wcdma
+from acts.test_utils.tel.anritsu_utils import sms_mo_send
+from acts.test_utils.tel.anritsu_utils import sms_mt_receive_verify
+from acts.test_utils.tel.anritsu_utils import set_usim_parameters
+from acts.test_utils.tel.anritsu_utils import set_post_sim_params
+from acts.test_utils.tel.tel_defines import DIRECTION_MOBILE_ORIGINATED
+from acts.test_utils.tel.tel_defines import DIRECTION_MOBILE_TERMINATED
+from acts.test_utils.tel.tel_defines import NETWORK_MODE_CDMA
+from acts.test_utils.tel.tel_defines import NETWORK_MODE_GSM_ONLY
+from acts.test_utils.tel.tel_defines import NETWORK_MODE_GSM_UMTS
+from acts.test_utils.tel.tel_defines import NETWORK_MODE_LTE_GSM_WCDMA
+from acts.test_utils.tel.tel_defines import RAT_1XRTT
+from acts.test_utils.tel.tel_defines import RAT_GSM
+from acts.test_utils.tel.tel_defines import RAT_LTE
+from acts.test_utils.tel.tel_defines import RAT_WCDMA
+from acts.test_utils.tel.tel_defines import RAT_FAMILY_CDMA2000
+from acts.test_utils.tel.tel_defines import RAT_FAMILY_GSM
+from acts.test_utils.tel.tel_defines import RAT_FAMILY_LTE
+from acts.test_utils.tel.tel_defines import RAT_FAMILY_UMTS
+from acts.test_utils.tel.tel_test_utils import ensure_network_rat
+from acts.test_utils.tel.tel_test_utils import ensure_phones_idle
+from acts.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
+from acts.test_utils.tel.tel_test_utils import toggle_volte
+from acts.test_utils.tel.tel_test_utils import set_preferred_apn_by_adb
+from acts.test_utils.tel.tel_defines import CALL_TEARDOWN_PHONE
+from acts.test_utils.tel.tel_defines import RAT_FAMILY_CDMA2000
+from acts.test_utils.tel.tel_defines import RAT_FAMILY_GSM
+from acts.test_utils.tel.tel_defines import RAT_FAMILY_LTE
+from acts.test_utils.tel.tel_defines import RAT_FAMILY_UMTS
+from acts.test_utils.tel.tel_defines import RAT_1XRTT
+from acts.test_utils.tel.tel_defines import NETWORK_MODE_CDMA
+from acts.test_utils.tel.tel_defines import NETWORK_MODE_GSM_ONLY
+from acts.test_utils.tel.tel_defines import NETWORK_MODE_GSM_UMTS
+from acts.test_utils.tel.tel_defines import NETWORK_MODE_LTE_CDMA_EVDO
+from acts.test_utils.tel.tel_defines import NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA
+from acts.test_utils.tel.tel_defines import NETWORK_MODE_LTE_GSM_WCDMA
from acts.utils import rand_ascii_str
SINGLE_PART_LEN = 40
diff --git a/acts_tests/tests/google/tel/lab/TelLabUeIdentityTest.py b/acts_tests/tests/google/tel/lab/TelLabUeIdentityTest.py
index e7858ce..3a9bb77 100644
--- a/acts_tests/tests/google/tel/lab/TelLabUeIdentityTest.py
+++ b/acts_tests/tests/google/tel/lab/TelLabUeIdentityTest.py
@@ -20,27 +20,27 @@
from acts.controllers.anritsu_lib._anritsu_utils import AnritsuError
from acts.controllers.anritsu_lib.md8475a import MD8475A
from acts.controllers.anritsu_lib.md8475a import UEIdentityType
-from acts_contrib.test_utils.tel.anritsu_utils import WAIT_TIME_ANRITSU_REG_AND_OPER
-from acts_contrib.test_utils.tel.anritsu_utils import read_ue_identity
-from acts_contrib.test_utils.tel.anritsu_utils import set_system_model_gsm
-from acts_contrib.test_utils.tel.anritsu_utils import set_system_model_lte
-from acts_contrib.test_utils.tel.anritsu_utils import set_system_model_wcdma
-from acts_contrib.test_utils.tel.tel_defines import NETWORK_MODE_CDMA
-from acts_contrib.test_utils.tel.tel_defines import NETWORK_MODE_GSM_ONLY
-from acts_contrib.test_utils.tel.tel_defines import NETWORK_MODE_GSM_UMTS
-from acts_contrib.test_utils.tel.tel_defines import NETWORK_MODE_LTE_GSM_WCDMA
-from acts_contrib.test_utils.tel.tel_defines import RAT_1XRTT
-from acts_contrib.test_utils.tel.tel_defines import RAT_GSM
-from acts_contrib.test_utils.tel.tel_defines import RAT_LTE
-from acts_contrib.test_utils.tel.tel_defines import RAT_WCDMA
-from acts_contrib.test_utils.tel.tel_defines import RAT_FAMILY_CDMA2000
-from acts_contrib.test_utils.tel.tel_defines import RAT_FAMILY_GSM
-from acts_contrib.test_utils.tel.tel_defines import RAT_FAMILY_LTE
-from acts_contrib.test_utils.tel.tel_defines import RAT_FAMILY_UMTS
-from acts_contrib.test_utils.tel.tel_test_utils import ensure_network_rat
-from acts_contrib.test_utils.tel.tel_test_utils import ensure_phones_idle
-from acts_contrib.test_utils.tel.tel_test_utils import toggle_airplane_mode
-from acts_contrib.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
+from acts.test_utils.tel.anritsu_utils import WAIT_TIME_ANRITSU_REG_AND_OPER
+from acts.test_utils.tel.anritsu_utils import read_ue_identity
+from acts.test_utils.tel.anritsu_utils import set_system_model_gsm
+from acts.test_utils.tel.anritsu_utils import set_system_model_lte
+from acts.test_utils.tel.anritsu_utils import set_system_model_wcdma
+from acts.test_utils.tel.tel_defines import NETWORK_MODE_CDMA
+from acts.test_utils.tel.tel_defines import NETWORK_MODE_GSM_ONLY
+from acts.test_utils.tel.tel_defines import NETWORK_MODE_GSM_UMTS
+from acts.test_utils.tel.tel_defines import NETWORK_MODE_LTE_GSM_WCDMA
+from acts.test_utils.tel.tel_defines import RAT_1XRTT
+from acts.test_utils.tel.tel_defines import RAT_GSM
+from acts.test_utils.tel.tel_defines import RAT_LTE
+from acts.test_utils.tel.tel_defines import RAT_WCDMA
+from acts.test_utils.tel.tel_defines import RAT_FAMILY_CDMA2000
+from acts.test_utils.tel.tel_defines import RAT_FAMILY_GSM
+from acts.test_utils.tel.tel_defines import RAT_FAMILY_LTE
+from acts.test_utils.tel.tel_defines import RAT_FAMILY_UMTS
+from acts.test_utils.tel.tel_test_utils import ensure_network_rat
+from acts.test_utils.tel.tel_test_utils import ensure_phones_idle
+from acts.test_utils.tel.tel_test_utils import toggle_airplane_mode
+from acts.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
class TelLabUeIdentityTest(TelephonyBaseTest):
diff --git a/acts_tests/tests/google/tel/lab/TelLabVoiceTest.py b/acts_tests/tests/google/tel/lab/TelLabVoiceTest.py
index f2417dd..1a638f9 100644
--- a/acts_tests/tests/google/tel/lab/TelLabVoiceTest.py
+++ b/acts_tests/tests/google/tel/lab/TelLabVoiceTest.py
@@ -24,42 +24,42 @@
from acts.controllers.anritsu_lib.md8475a import MD8475A
from acts.controllers.anritsu_lib.md8475a import VirtualPhoneAutoAnswer
from acts.controllers.anritsu_lib.md8475a import VirtualPhoneStatus
-from acts_contrib.test_utils.tel.anritsu_utils import WAIT_TIME_ANRITSU_REG_AND_CALL
-from acts_contrib.test_utils.tel.anritsu_utils import call_mo_setup_teardown
-from acts_contrib.test_utils.tel.anritsu_utils import ims_call_cs_teardown
-from acts_contrib.test_utils.tel.anritsu_utils import call_mt_setup_teardown
-from acts_contrib.test_utils.tel.anritsu_utils import set_system_model_1x
-from acts_contrib.test_utils.tel.anritsu_utils import set_system_model_1x_evdo
-from acts_contrib.test_utils.tel.anritsu_utils import set_system_model_gsm
-from acts_contrib.test_utils.tel.anritsu_utils import set_system_model_lte
-from acts_contrib.test_utils.tel.anritsu_utils import set_system_model_lte_1x
-from acts_contrib.test_utils.tel.anritsu_utils import set_system_model_lte_wcdma
-from acts_contrib.test_utils.tel.anritsu_utils import set_system_model_lte_gsm
-from acts_contrib.test_utils.tel.anritsu_utils import set_system_model_wcdma
-from acts_contrib.test_utils.tel.anritsu_utils import set_usim_parameters
-from acts_contrib.test_utils.tel.anritsu_utils import set_post_sim_params
-from acts_contrib.test_utils.tel.tel_defines import CALL_TEARDOWN_PHONE
-from acts_contrib.test_utils.tel.tel_defines import RAT_FAMILY_CDMA2000
-from acts_contrib.test_utils.tel.tel_defines import RAT_FAMILY_GSM
-from acts_contrib.test_utils.tel.tel_defines import RAT_FAMILY_LTE
-from acts_contrib.test_utils.tel.tel_defines import RAT_FAMILY_UMTS
-from acts_contrib.test_utils.tel.tel_defines import RAT_1XRTT
-from acts_contrib.test_utils.tel.tel_defines import NETWORK_MODE_CDMA
-from acts_contrib.test_utils.tel.tel_defines import NETWORK_MODE_GSM_ONLY
-from acts_contrib.test_utils.tel.tel_defines import NETWORK_MODE_GSM_UMTS
-from acts_contrib.test_utils.tel.tel_defines import NETWORK_MODE_LTE_CDMA_EVDO
-from acts_contrib.test_utils.tel.tel_defines import NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA
-from acts_contrib.test_utils.tel.tel_defines import NETWORK_MODE_LTE_GSM_WCDMA
-from acts_contrib.test_utils.tel.tel_defines import WAIT_TIME_IN_CALL
-from acts_contrib.test_utils.tel.tel_defines import WAIT_TIME_IN_CALL_FOR_IMS
-from acts_contrib.test_utils.tel.tel_test_utils import ensure_network_rat
-from acts_contrib.test_utils.tel.tel_test_utils import ensure_phones_idle
-from acts_contrib.test_utils.tel.tel_test_utils import toggle_airplane_mode_by_adb
-from acts_contrib.test_utils.tel.tel_test_utils import toggle_volte
-from acts_contrib.test_utils.tel.tel_test_utils import set_preferred_apn_by_adb
-from acts_contrib.test_utils.tel.tel_test_utils import start_qxdm_loggers
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_idle_volte
-from acts_contrib.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
+from acts.test_utils.tel.anritsu_utils import WAIT_TIME_ANRITSU_REG_AND_CALL
+from acts.test_utils.tel.anritsu_utils import call_mo_setup_teardown
+from acts.test_utils.tel.anritsu_utils import ims_call_cs_teardown
+from acts.test_utils.tel.anritsu_utils import call_mt_setup_teardown
+from acts.test_utils.tel.anritsu_utils import set_system_model_1x
+from acts.test_utils.tel.anritsu_utils import set_system_model_1x_evdo
+from acts.test_utils.tel.anritsu_utils import set_system_model_gsm
+from acts.test_utils.tel.anritsu_utils import set_system_model_lte
+from acts.test_utils.tel.anritsu_utils import set_system_model_lte_1x
+from acts.test_utils.tel.anritsu_utils import set_system_model_lte_wcdma
+from acts.test_utils.tel.anritsu_utils import set_system_model_lte_gsm
+from acts.test_utils.tel.anritsu_utils import set_system_model_wcdma
+from acts.test_utils.tel.anritsu_utils import set_usim_parameters
+from acts.test_utils.tel.anritsu_utils import set_post_sim_params
+from acts.test_utils.tel.tel_defines import CALL_TEARDOWN_PHONE
+from acts.test_utils.tel.tel_defines import RAT_FAMILY_CDMA2000
+from acts.test_utils.tel.tel_defines import RAT_FAMILY_GSM
+from acts.test_utils.tel.tel_defines import RAT_FAMILY_LTE
+from acts.test_utils.tel.tel_defines import RAT_FAMILY_UMTS
+from acts.test_utils.tel.tel_defines import RAT_1XRTT
+from acts.test_utils.tel.tel_defines import NETWORK_MODE_CDMA
+from acts.test_utils.tel.tel_defines import NETWORK_MODE_GSM_ONLY
+from acts.test_utils.tel.tel_defines import NETWORK_MODE_GSM_UMTS
+from acts.test_utils.tel.tel_defines import NETWORK_MODE_LTE_CDMA_EVDO
+from acts.test_utils.tel.tel_defines import NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA
+from acts.test_utils.tel.tel_defines import NETWORK_MODE_LTE_GSM_WCDMA
+from acts.test_utils.tel.tel_defines import WAIT_TIME_IN_CALL
+from acts.test_utils.tel.tel_defines import WAIT_TIME_IN_CALL_FOR_IMS
+from acts.test_utils.tel.tel_test_utils import ensure_network_rat
+from acts.test_utils.tel.tel_test_utils import ensure_phones_idle
+from acts.test_utils.tel.tel_test_utils import toggle_airplane_mode_by_adb
+from acts.test_utils.tel.tel_test_utils import toggle_volte
+from acts.test_utils.tel.tel_test_utils import set_preferred_apn_by_adb
+from acts.test_utils.tel.tel_test_utils import start_qxdm_loggers
+from acts.test_utils.tel.tel_voice_utils import phone_idle_volte
+from acts.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
DEFAULT_CALL_NUMBER = "0123456789"
diff --git a/acts_tests/tests/google/tel/live/TelLiveCBRSTest.py b/acts_tests/tests/google/tel/live/TelLiveCBRSTest.py
index 7b63288..5269bd6 100644
--- a/acts_tests/tests/google/tel/live/TelLiveCBRSTest.py
+++ b/acts_tests/tests/google/tel/live/TelLiveCBRSTest.py
@@ -21,52 +21,52 @@
import collections
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
-from acts_contrib.test_utils.tel.tel_defines import DIRECTION_MOBILE_ORIGINATED
-from acts_contrib.test_utils.tel.tel_defines import DIRECTION_MOBILE_TERMINATED
-from acts_contrib.test_utils.tel.tel_defines import WAIT_TIME_BETWEEN_REG_AND_CALL
-from acts_contrib.test_utils.tel.tel_defines import WAIT_TIME_IN_CALL
-from acts_contrib.test_utils.tel.tel_defines import WAIT_TIME_FOR_CBRS_DATA_SWITCH
-from acts_contrib.test_utils.tel.tel_defines import EventActiveDataSubIdChanged
-from acts_contrib.test_utils.tel.tel_defines import NetworkCallbackAvailable
-from acts_contrib.test_utils.tel.tel_defines import EventNetworkCallback
-from acts_contrib.test_utils.tel.tel_test_utils import get_phone_number
-from acts_contrib.test_utils.tel.tel_test_utils import hangup_call
-from acts_contrib.test_utils.tel.tel_test_utils import hangup_call_by_adb
-from acts_contrib.test_utils.tel.tel_test_utils import initiate_call
-from acts_contrib.test_utils.tel.tel_test_utils import is_phone_not_in_call
-from acts_contrib.test_utils.tel.tel_test_utils import wait_and_answer_call
-from acts_contrib.test_utils.tel.tel_test_utils import is_phone_in_call
-from acts_contrib.test_utils.tel.tel_test_utils import start_qxdm_loggers
-from acts_contrib.test_utils.tel.tel_test_utils import load_scone_cat_simulate_data
-from acts_contrib.test_utils.tel.tel_test_utils import test_data_browsing_success_using_sl4a
-from acts_contrib.test_utils.tel.tel_test_utils import test_data_browsing_failure_using_sl4a
-from acts_contrib.test_utils.tel.tel_test_utils import get_operator_name
-from acts_contrib.test_utils.tel.tel_test_utils import is_current_data_on_cbrs
-from acts_contrib.test_utils.tel.tel_test_utils import toggle_airplane_mode
-from acts_contrib.test_utils.tel.tel_test_utils import STORY_LINE
-from acts_contrib.test_utils.tel.tel_test_utils import get_device_epoch_time
-from acts_contrib.test_utils.tel.tel_test_utils import start_qxdm_logger
-from acts_contrib.test_utils.tel.tel_test_utils import wifi_toggle_state
-from acts_contrib.test_utils.tel.tel_voice_utils import is_phone_in_call_3g
-from acts_contrib.test_utils.tel.tel_voice_utils import is_phone_in_call_2g
-from acts_contrib.test_utils.tel.tel_voice_utils import is_phone_in_call_csfb
-from acts_contrib.test_utils.tel.tel_voice_utils import is_phone_in_call_iwlan
-from acts_contrib.test_utils.tel.tel_voice_utils import is_phone_in_call_not_iwlan
-from acts_contrib.test_utils.tel.tel_voice_utils import is_phone_in_call_volte
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_voice_general
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_volte_for_subscription
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_cdma
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_voice_2g
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_idle_3g
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_idle_2g
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_idle_csfb
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_idle_iwlan
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_idle_not_iwlan
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_idle_volte
-from acts_contrib.test_utils.tel.tel_subscription_utils import get_subid_from_slot_index
-from acts_contrib.test_utils.tel.tel_subscription_utils import get_operatorname_from_slot_index
-from acts_contrib.test_utils.tel.tel_subscription_utils import get_cbrs_and_default_sub_id
+from acts.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
+from acts.test_utils.tel.tel_defines import DIRECTION_MOBILE_ORIGINATED
+from acts.test_utils.tel.tel_defines import DIRECTION_MOBILE_TERMINATED
+from acts.test_utils.tel.tel_defines import WAIT_TIME_BETWEEN_REG_AND_CALL
+from acts.test_utils.tel.tel_defines import WAIT_TIME_IN_CALL
+from acts.test_utils.tel.tel_defines import WAIT_TIME_FOR_CBRS_DATA_SWITCH
+from acts.test_utils.tel.tel_defines import EventActiveDataSubIdChanged
+from acts.test_utils.tel.tel_defines import NetworkCallbackAvailable
+from acts.test_utils.tel.tel_defines import EventNetworkCallback
+from acts.test_utils.tel.tel_test_utils import get_phone_number
+from acts.test_utils.tel.tel_test_utils import hangup_call
+from acts.test_utils.tel.tel_test_utils import hangup_call_by_adb
+from acts.test_utils.tel.tel_test_utils import initiate_call
+from acts.test_utils.tel.tel_test_utils import is_phone_not_in_call
+from acts.test_utils.tel.tel_test_utils import wait_and_answer_call
+from acts.test_utils.tel.tel_test_utils import is_phone_in_call
+from acts.test_utils.tel.tel_test_utils import start_qxdm_loggers
+from acts.test_utils.tel.tel_test_utils import load_scone_cat_simulate_data
+from acts.test_utils.tel.tel_test_utils import test_data_browsing_success_using_sl4a
+from acts.test_utils.tel.tel_test_utils import test_data_browsing_failure_using_sl4a
+from acts.test_utils.tel.tel_test_utils import get_operator_name
+from acts.test_utils.tel.tel_test_utils import is_current_data_on_cbrs
+from acts.test_utils.tel.tel_test_utils import toggle_airplane_mode
+from acts.test_utils.tel.tel_test_utils import STORY_LINE
+from acts.test_utils.tel.tel_test_utils import get_device_epoch_time
+from acts.test_utils.tel.tel_test_utils import start_qxdm_logger
+from acts.test_utils.tel.tel_test_utils import wifi_toggle_state
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_3g
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_2g
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_csfb
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_iwlan
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_not_iwlan
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_volte
+from acts.test_utils.tel.tel_voice_utils import phone_setup_voice_general
+from acts.test_utils.tel.tel_voice_utils import phone_setup_volte_for_subscription
+from acts.test_utils.tel.tel_voice_utils import phone_setup_cdma
+from acts.test_utils.tel.tel_voice_utils import phone_setup_voice_2g
+from acts.test_utils.tel.tel_voice_utils import phone_idle_3g
+from acts.test_utils.tel.tel_voice_utils import phone_idle_2g
+from acts.test_utils.tel.tel_voice_utils import phone_idle_csfb
+from acts.test_utils.tel.tel_voice_utils import phone_idle_iwlan
+from acts.test_utils.tel.tel_voice_utils import phone_idle_not_iwlan
+from acts.test_utils.tel.tel_voice_utils import phone_idle_volte
+from acts.test_utils.tel.tel_subscription_utils import get_subid_from_slot_index
+from acts.test_utils.tel.tel_subscription_utils import get_operatorname_from_slot_index
+from acts.test_utils.tel.tel_subscription_utils import get_cbrs_and_default_sub_id
from acts.utils import get_current_epoch_time
from queue import Empty
diff --git a/acts_tests/tests/google/tel/live/TelLiveCellInfoTest.py b/acts_tests/tests/google/tel/live/TelLiveCellInfoTest.py
index 5895d10..037f260 100644
--- a/acts_tests/tests/google/tel/live/TelLiveCellInfoTest.py
+++ b/acts_tests/tests/google/tel/live/TelLiveCellInfoTest.py
@@ -18,10 +18,10 @@
import time
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
-from acts_contrib.test_utils.tel.tel_test_utils import ensure_wifi_connected, \
+from acts.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
+from acts.test_utils.tel.tel_test_utils import ensure_wifi_connected, \
toggle_airplane_mode, ensure_phones_idle, start_qxdm_loggers
-from acts_contrib.test_utils.wifi import wifi_test_utils
+from acts.test_utils.wifi import wifi_test_utils
from acts.utils import disable_usb_charging, enable_usb_charging
NANO_TO_SEC = 1000000000
diff --git a/acts_tests/tests/google/tel/live/TelLiveConnectivityMonitorBaseTest.py b/acts_tests/tests/google/tel/live/TelLiveConnectivityMonitorBaseTest.py
index 5ec5ddb..b7e4403 100644
--- a/acts_tests/tests/google/tel/live/TelLiveConnectivityMonitorBaseTest.py
+++ b/acts_tests/tests/google/tel/live/TelLiveConnectivityMonitorBaseTest.py
@@ -22,44 +22,44 @@
import time
from acts import signals
-from acts_contrib.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
-from acts_contrib.test_utils.tel.tel_defines import CAPABILITY_VOLTE
-from acts_contrib.test_utils.tel.tel_defines import CAPABILITY_VT
-from acts_contrib.test_utils.tel.tel_defines import CAPABILITY_WFC
-from acts_contrib.test_utils.tel.tel_defines import MAX_WAIT_TIME_FOR_STATE_CHANGE
-from acts_contrib.test_utils.tel.tel_defines import WFC_MODE_WIFI_PREFERRED
-from acts_contrib.test_utils.tel.tel_defines import VT_STATE_BIDIRECTIONAL
-from acts_contrib.test_utils.tel.tel_test_utils import bring_up_connectivity_monitor
-from acts_contrib.test_utils.tel.tel_test_utils import call_setup_teardown
-from acts_contrib.test_utils.tel.tel_test_utils import ensure_wifi_connected
-from acts_contrib.test_utils.tel.tel_test_utils import fastboot_wipe
-from acts_contrib.test_utils.tel.tel_test_utils import get_device_epoch_time
-from acts_contrib.test_utils.tel.tel_test_utils import get_model_name
-from acts_contrib.test_utils.tel.tel_test_utils import get_operator_name
-from acts_contrib.test_utils.tel.tel_test_utils import get_outgoing_voice_sub_id
-from acts_contrib.test_utils.tel.tel_test_utils import hangup_call
-from acts_contrib.test_utils.tel.tel_test_utils import last_call_drop_reason
-from acts_contrib.test_utils.tel.tel_test_utils import reboot_device
-from acts_contrib.test_utils.tel.tel_test_utils import toggle_airplane_mode
-from acts_contrib.test_utils.tel.tel_test_utils import toggle_volte
-from acts_contrib.test_utils.tel.tel_test_utils import toggle_wfc
-from acts_contrib.test_utils.tel.tel_test_utils import wait_for_wfc_enabled
-from acts_contrib.test_utils.tel.tel_test_utils import wifi_toggle_state
-from acts_contrib.test_utils.tel.tel_test_utils import trigger_modem_crash
-from acts_contrib.test_utils.tel.tel_test_utils import trigger_modem_crash_by_modem
-from acts_contrib.test_utils.tel.tel_voice_utils import is_phone_in_call_2g
-from acts_contrib.test_utils.tel.tel_voice_utils import is_phone_in_call_3g
-from acts_contrib.test_utils.tel.tel_voice_utils import is_phone_in_call_csfb
-from acts_contrib.test_utils.tel.tel_voice_utils import is_phone_in_call_iwlan
-from acts_contrib.test_utils.tel.tel_voice_utils import is_phone_in_call_volte
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_voice_2g
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_voice_3g
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_csfb
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_iwlan
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_volte
-from acts_contrib.test_utils.tel.tel_video_utils import video_call_setup_teardown
-from acts_contrib.test_utils.tel.tel_video_utils import phone_setup_video
-from acts_contrib.test_utils.tel.tel_video_utils import \
+from acts.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
+from acts.test_utils.tel.tel_defines import CAPABILITY_VOLTE
+from acts.test_utils.tel.tel_defines import CAPABILITY_VT
+from acts.test_utils.tel.tel_defines import CAPABILITY_WFC
+from acts.test_utils.tel.tel_defines import MAX_WAIT_TIME_FOR_STATE_CHANGE
+from acts.test_utils.tel.tel_defines import WFC_MODE_WIFI_PREFERRED
+from acts.test_utils.tel.tel_defines import VT_STATE_BIDIRECTIONAL
+from acts.test_utils.tel.tel_test_utils import bring_up_connectivity_monitor
+from acts.test_utils.tel.tel_test_utils import call_setup_teardown
+from acts.test_utils.tel.tel_test_utils import ensure_wifi_connected
+from acts.test_utils.tel.tel_test_utils import fastboot_wipe
+from acts.test_utils.tel.tel_test_utils import get_device_epoch_time
+from acts.test_utils.tel.tel_test_utils import get_model_name
+from acts.test_utils.tel.tel_test_utils import get_operator_name
+from acts.test_utils.tel.tel_test_utils import get_outgoing_voice_sub_id
+from acts.test_utils.tel.tel_test_utils import hangup_call
+from acts.test_utils.tel.tel_test_utils import last_call_drop_reason
+from acts.test_utils.tel.tel_test_utils import reboot_device
+from acts.test_utils.tel.tel_test_utils import toggle_airplane_mode
+from acts.test_utils.tel.tel_test_utils import toggle_volte
+from acts.test_utils.tel.tel_test_utils import toggle_wfc
+from acts.test_utils.tel.tel_test_utils import wait_for_wfc_enabled
+from acts.test_utils.tel.tel_test_utils import wifi_toggle_state
+from acts.test_utils.tel.tel_test_utils import trigger_modem_crash
+from acts.test_utils.tel.tel_test_utils import trigger_modem_crash_by_modem
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_2g
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_3g
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_csfb
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_iwlan
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_volte
+from acts.test_utils.tel.tel_voice_utils import phone_setup_voice_2g
+from acts.test_utils.tel.tel_voice_utils import phone_setup_voice_3g
+from acts.test_utils.tel.tel_voice_utils import phone_setup_csfb
+from acts.test_utils.tel.tel_voice_utils import phone_setup_iwlan
+from acts.test_utils.tel.tel_voice_utils import phone_setup_volte
+from acts.test_utils.tel.tel_video_utils import video_call_setup_teardown
+from acts.test_utils.tel.tel_video_utils import phone_setup_video
+from acts.test_utils.tel.tel_video_utils import \
is_phone_in_call_video_bidirectional
CALL_DROP_CODE_MAPPING = {
diff --git a/acts_tests/tests/google/tel/live/TelLiveConnectivityMonitorMobilityTest.py b/acts_tests/tests/google/tel/live/TelLiveConnectivityMonitorMobilityTest.py
index fd76813..2cd6ad5 100644
--- a/acts_tests/tests/google/tel/live/TelLiveConnectivityMonitorMobilityTest.py
+++ b/acts_tests/tests/google/tel/live/TelLiveConnectivityMonitorMobilityTest.py
@@ -19,24 +19,24 @@
import time
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
-from acts_contrib.test_utils.tel.tel_atten_utils import set_rssi
-from acts_contrib.test_utils.tel.tel_defines import CELL_WEAK_RSSI_VALUE
-from acts_contrib.test_utils.tel.tel_defines import INVALID_WIFI_RSSI
-from acts_contrib.test_utils.tel.tel_defines import MAX_RSSI_RESERVED_VALUE
-from acts_contrib.test_utils.tel.tel_defines import MIN_RSSI_RESERVED_VALUE
-from acts_contrib.test_utils.tel.tel_defines import WAIT_TIME_WIFI_RSSI_CALIBRATION_SCREEN_ON
-from acts_contrib.test_utils.tel.tel_defines import WAIT_TIME_WIFI_RSSI_CALIBRATION_WIFI_CONNECTED
-from acts_contrib.test_utils.tel.tel_defines import WFC_MODE_CELLULAR_PREFERRED
-from acts_contrib.test_utils.tel.tel_defines import WFC_MODE_WIFI_PREFERRED
-from acts_contrib.test_utils.tel.tel_defines import WIFI_WEAK_RSSI_VALUE
-from acts_contrib.test_utils.tel.tel_defines import SignalStrengthContainer
-from acts_contrib.test_utils.tel.tel_test_utils import ensure_phones_default_state
-from acts_contrib.test_utils.tel.tel_test_utils import ensure_phone_subscription
-from acts_contrib.test_utils.tel.tel_test_utils import ensure_wifi_connected
-from acts_contrib.test_utils.tel.tel_test_utils import set_wfc_mode
-from acts_contrib.test_utils.tel.tel_test_utils import wait_for_wifi_data_connection
-from acts_contrib.test_utils.tel.tel_test_utils import verify_internet_connection
+from acts.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
+from acts.test_utils.tel.tel_atten_utils import set_rssi
+from acts.test_utils.tel.tel_defines import CELL_WEAK_RSSI_VALUE
+from acts.test_utils.tel.tel_defines import INVALID_WIFI_RSSI
+from acts.test_utils.tel.tel_defines import MAX_RSSI_RESERVED_VALUE
+from acts.test_utils.tel.tel_defines import MIN_RSSI_RESERVED_VALUE
+from acts.test_utils.tel.tel_defines import WAIT_TIME_WIFI_RSSI_CALIBRATION_SCREEN_ON
+from acts.test_utils.tel.tel_defines import WAIT_TIME_WIFI_RSSI_CALIBRATION_WIFI_CONNECTED
+from acts.test_utils.tel.tel_defines import WFC_MODE_CELLULAR_PREFERRED
+from acts.test_utils.tel.tel_defines import WFC_MODE_WIFI_PREFERRED
+from acts.test_utils.tel.tel_defines import WIFI_WEAK_RSSI_VALUE
+from acts.test_utils.tel.tel_defines import SignalStrengthContainer
+from acts.test_utils.tel.tel_test_utils import ensure_phones_default_state
+from acts.test_utils.tel.tel_test_utils import ensure_phone_subscription
+from acts.test_utils.tel.tel_test_utils import ensure_wifi_connected
+from acts.test_utils.tel.tel_test_utils import set_wfc_mode
+from acts.test_utils.tel.tel_test_utils import wait_for_wifi_data_connection
+from acts.test_utils.tel.tel_test_utils import verify_internet_connection
from TelLiveConnectivityMonitorBaseTest import TelLiveConnectivityMonitorBaseTest
# Attenuator name
diff --git a/acts_tests/tests/google/tel/live/TelLiveConnectivityMonitorTest.py b/acts_tests/tests/google/tel/live/TelLiveConnectivityMonitorTest.py
index 995c292..c0f0953 100644
--- a/acts_tests/tests/google/tel/live/TelLiveConnectivityMonitorTest.py
+++ b/acts_tests/tests/google/tel/live/TelLiveConnectivityMonitorTest.py
@@ -18,8 +18,8 @@
"""
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
-from acts_contrib.test_utils.tel.tel_defines import CAPABILITY_VOLTE
+from acts.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
+from acts.test_utils.tel.tel_defines import CAPABILITY_VOLTE
from TelLiveConnectivityMonitorBaseTest import TelLiveConnectivityMonitorBaseTest
from TelLiveConnectivityMonitorBaseTest import ACTIONS
from TelLiveConnectivityMonitorBaseTest import TROUBLES
diff --git a/acts_tests/tests/google/tel/live/TelLiveDSDSVoiceTest.py b/acts_tests/tests/google/tel/live/TelLiveDSDSVoiceTest.py
index b547132..c979c7a 100644
--- a/acts_tests/tests/google/tel/live/TelLiveDSDSVoiceTest.py
+++ b/acts_tests/tests/google/tel/live/TelLiveDSDSVoiceTest.py
@@ -23,103 +23,103 @@
from queue import Empty
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
-from acts_contrib.test_utils.tel.tel_defines import DIRECTION_MOBILE_ORIGINATED
-from acts_contrib.test_utils.tel.tel_defines import DIRECTION_MOBILE_TERMINATED
-from acts_contrib.test_utils.tel.tel_defines import GEN_3G
-from acts_contrib.test_utils.tel.tel_defines import GEN_4G
-from acts_contrib.test_utils.tel.tel_defines import INVALID_WIFI_RSSI
-from acts_contrib.test_utils.tel.tel_defines import MAX_WAIT_TIME_CALL_DROP
-from acts_contrib.test_utils.tel.tel_defines import MAX_WAIT_TIME_NW_SELECTION
-from acts_contrib.test_utils.tel.tel_defines import NETWORK_SERVICE_DATA
-from acts_contrib.test_utils.tel.tel_defines import NETWORK_SERVICE_VOICE
-from acts_contrib.test_utils.tel.tel_defines import PRECISE_CALL_STATE_LISTEN_LEVEL_BACKGROUND
-from acts_contrib.test_utils.tel.tel_defines import PRECISE_CALL_STATE_LISTEN_LEVEL_FOREGROUND
-from acts_contrib.test_utils.tel.tel_defines import PRECISE_CALL_STATE_LISTEN_LEVEL_RINGING
-from acts_contrib.test_utils.tel.tel_defines import RAT_LTE
-from acts_contrib.test_utils.tel.tel_defines import RAT_IWLAN
-from acts_contrib.test_utils.tel.tel_defines import RAT_WCDMA
-from acts_contrib.test_utils.tel.tel_defines import WAIT_TIME_BETWEEN_REG_AND_CALL
-from acts_contrib.test_utils.tel.tel_defines import WAIT_TIME_IN_CALL
-from acts_contrib.test_utils.tel.tel_defines import WAIT_TIME_WIFI_RSSI_CALIBRATION_SCREEN_ON
-from acts_contrib.test_utils.tel.tel_defines import WAIT_TIME_WIFI_RSSI_CALIBRATION_WIFI_CONNECTED
-from acts_contrib.test_utils.tel.tel_defines import WFC_MODE_CELLULAR_PREFERRED
-from acts_contrib.test_utils.tel.tel_defines import WFC_MODE_DISABLED
-from acts_contrib.test_utils.tel.tel_defines import WFC_MODE_WIFI_ONLY
-from acts_contrib.test_utils.tel.tel_defines import WFC_MODE_WIFI_PREFERRED
-from acts_contrib.test_utils.tel.tel_defines import WIFI_WEAK_RSSI_VALUE
-from acts_contrib.test_utils.tel.tel_defines import EventNetworkCallback
-from acts_contrib.test_utils.tel.tel_defines import NetworkCallbackAvailable
-from acts_contrib.test_utils.tel.tel_defines import NetworkCallbackLost
-from acts_contrib.test_utils.tel.tel_defines import SignalStrengthContainer
-from acts_contrib.test_utils.tel.tel_defines import WAIT_TIME_CHANGE_DATA_SUB_ID
-from acts_contrib.test_utils.tel.tel_test_utils import wifi_toggle_state
-from acts_contrib.test_utils.tel.tel_test_utils import ensure_network_generation
-from acts_contrib.test_utils.tel.tel_test_utils import ensure_phones_default_state
-from acts_contrib.test_utils.tel.tel_test_utils import ensure_wifi_connected
-from acts_contrib.test_utils.tel.tel_test_utils import get_network_rat
-from acts_contrib.test_utils.tel.tel_test_utils import get_phone_number
-from acts_contrib.test_utils.tel.tel_test_utils import get_phone_number_for_subscription
-from acts_contrib.test_utils.tel.tel_test_utils import hangup_call
-from acts_contrib.test_utils.tel.tel_test_utils import hangup_call_by_adb
-from acts_contrib.test_utils.tel.tel_test_utils import initiate_call
-from acts_contrib.test_utils.tel.tel_test_utils import is_network_call_back_event_match
-from acts_contrib.test_utils.tel.tel_test_utils import is_phone_in_call
-from acts_contrib.test_utils.tel.tel_test_utils import is_phone_not_in_call
-from acts_contrib.test_utils.tel.tel_test_utils import set_wfc_mode
-from acts_contrib.test_utils.tel.tel_test_utils import toggle_airplane_mode
-from acts_contrib.test_utils.tel.tel_test_utils import toggle_volte
-from acts_contrib.test_utils.tel.tel_test_utils import wait_and_answer_call
-from acts_contrib.test_utils.tel.tel_test_utils import wait_for_cell_data_connection
-from acts_contrib.test_utils.tel.tel_test_utils import wait_for_droid_not_in_call
-from acts_contrib.test_utils.tel.tel_test_utils import wait_for_wfc_disabled
-from acts_contrib.test_utils.tel.tel_test_utils import wait_for_wfc_enabled
-from acts_contrib.test_utils.tel.tel_test_utils import wait_for_wifi_data_connection
-from acts_contrib.test_utils.tel.tel_test_utils import verify_http_connection
-from acts_contrib.test_utils.tel.tel_test_utils import get_telephony_signal_strength
-from acts_contrib.test_utils.tel.tel_test_utils import get_lte_rsrp
-from acts_contrib.test_utils.tel.tel_test_utils import get_wifi_signal_strength
-from acts_contrib.test_utils.tel.tel_test_utils import wait_for_state
-from acts_contrib.test_utils.tel.tel_test_utils import is_phone_in_call
-from acts_contrib.test_utils.tel.tel_test_utils import start_qxdm_loggers
-from acts_contrib.test_utils.tel.tel_test_utils import start_qxdm_logger
-from acts_contrib.test_utils.tel.tel_test_utils import active_file_download_test
-from acts_contrib.test_utils.tel.tel_test_utils import verify_internet_connection
-from acts_contrib.test_utils.tel.tel_test_utils import test_data_browsing_success_using_sl4a
-from acts_contrib.test_utils.tel.tel_test_utils import test_data_browsing_failure_using_sl4a
-from acts_contrib.test_utils.tel.tel_test_utils import sms_send_receive_verify
-from acts_contrib.test_utils.tel.tel_test_utils import mms_send_receive_verify
-from acts_contrib.test_utils.tel.tel_test_utils import get_operator_name
-from acts_contrib.test_utils.tel.tel_voice_utils import is_phone_in_call_3g
-from acts_contrib.test_utils.tel.tel_voice_utils import is_phone_in_call_2g
-from acts_contrib.test_utils.tel.tel_voice_utils import is_phone_in_call_csfb
-from acts_contrib.test_utils.tel.tel_voice_utils import is_phone_in_call_iwlan
-from acts_contrib.test_utils.tel.tel_voice_utils import is_phone_in_call_not_iwlan
-from acts_contrib.test_utils.tel.tel_voice_utils import is_phone_in_call_volte
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_voice_general
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_volte
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_voice_3g
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_voice_2g
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_idle_3g
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_idle_3g_for_subscription
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_idle_2g
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_idle_csfb
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_idle_iwlan
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_idle_not_iwlan
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_idle_volte
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_3g
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_2g
-from acts_contrib.test_utils.tel.tel_subscription_utils import set_subid_for_outgoing_call
-from acts_contrib.test_utils.tel.tel_subscription_utils import set_incoming_voice_sub_id
-from acts_contrib.test_utils.tel.tel_subscription_utils import get_subid_from_slot_index
-from acts_contrib.test_utils.tel.tel_subscription_utils import get_operatorname_from_slot_index
-from acts_contrib.test_utils.tel.tel_subscription_utils import get_default_data_sub_id
-from acts_contrib.test_utils.tel.tel_subscription_utils import perform_dds_switch
-from acts_contrib.test_utils.tel.tel_subscription_utils import set_subid_for_data
-from acts_contrib.test_utils.tel.tel_subscription_utils import set_dds_on_slot_0
-from acts_contrib.test_utils.tel.tel_subscription_utils import set_dds_on_slot_1
-from acts_contrib.test_utils.tel.tel_subscription_utils import set_subid_for_message
-from acts_contrib.test_utils.tel.tel_subscription_utils import set_slways_allow_mms_data
+from acts.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
+from acts.test_utils.tel.tel_defines import DIRECTION_MOBILE_ORIGINATED
+from acts.test_utils.tel.tel_defines import DIRECTION_MOBILE_TERMINATED
+from acts.test_utils.tel.tel_defines import GEN_3G
+from acts.test_utils.tel.tel_defines import GEN_4G
+from acts.test_utils.tel.tel_defines import INVALID_WIFI_RSSI
+from acts.test_utils.tel.tel_defines import MAX_WAIT_TIME_CALL_DROP
+from acts.test_utils.tel.tel_defines import MAX_WAIT_TIME_NW_SELECTION
+from acts.test_utils.tel.tel_defines import NETWORK_SERVICE_DATA
+from acts.test_utils.tel.tel_defines import NETWORK_SERVICE_VOICE
+from acts.test_utils.tel.tel_defines import PRECISE_CALL_STATE_LISTEN_LEVEL_BACKGROUND
+from acts.test_utils.tel.tel_defines import PRECISE_CALL_STATE_LISTEN_LEVEL_FOREGROUND
+from acts.test_utils.tel.tel_defines import PRECISE_CALL_STATE_LISTEN_LEVEL_RINGING
+from acts.test_utils.tel.tel_defines import RAT_LTE
+from acts.test_utils.tel.tel_defines import RAT_IWLAN
+from acts.test_utils.tel.tel_defines import RAT_WCDMA
+from acts.test_utils.tel.tel_defines import WAIT_TIME_BETWEEN_REG_AND_CALL
+from acts.test_utils.tel.tel_defines import WAIT_TIME_IN_CALL
+from acts.test_utils.tel.tel_defines import WAIT_TIME_WIFI_RSSI_CALIBRATION_SCREEN_ON
+from acts.test_utils.tel.tel_defines import WAIT_TIME_WIFI_RSSI_CALIBRATION_WIFI_CONNECTED
+from acts.test_utils.tel.tel_defines import WFC_MODE_CELLULAR_PREFERRED
+from acts.test_utils.tel.tel_defines import WFC_MODE_DISABLED
+from acts.test_utils.tel.tel_defines import WFC_MODE_WIFI_ONLY
+from acts.test_utils.tel.tel_defines import WFC_MODE_WIFI_PREFERRED
+from acts.test_utils.tel.tel_defines import WIFI_WEAK_RSSI_VALUE
+from acts.test_utils.tel.tel_defines import EventNetworkCallback
+from acts.test_utils.tel.tel_defines import NetworkCallbackAvailable
+from acts.test_utils.tel.tel_defines import NetworkCallbackLost
+from acts.test_utils.tel.tel_defines import SignalStrengthContainer
+from acts.test_utils.tel.tel_defines import WAIT_TIME_CHANGE_DATA_SUB_ID
+from acts.test_utils.tel.tel_test_utils import wifi_toggle_state
+from acts.test_utils.tel.tel_test_utils import ensure_network_generation
+from acts.test_utils.tel.tel_test_utils import ensure_phones_default_state
+from acts.test_utils.tel.tel_test_utils import ensure_wifi_connected
+from acts.test_utils.tel.tel_test_utils import get_network_rat
+from acts.test_utils.tel.tel_test_utils import get_phone_number
+from acts.test_utils.tel.tel_test_utils import get_phone_number_for_subscription
+from acts.test_utils.tel.tel_test_utils import hangup_call
+from acts.test_utils.tel.tel_test_utils import hangup_call_by_adb
+from acts.test_utils.tel.tel_test_utils import initiate_call
+from acts.test_utils.tel.tel_test_utils import is_network_call_back_event_match
+from acts.test_utils.tel.tel_test_utils import is_phone_in_call
+from acts.test_utils.tel.tel_test_utils import is_phone_not_in_call
+from acts.test_utils.tel.tel_test_utils import set_wfc_mode
+from acts.test_utils.tel.tel_test_utils import toggle_airplane_mode
+from acts.test_utils.tel.tel_test_utils import toggle_volte
+from acts.test_utils.tel.tel_test_utils import wait_and_answer_call
+from acts.test_utils.tel.tel_test_utils import wait_for_cell_data_connection
+from acts.test_utils.tel.tel_test_utils import wait_for_droid_not_in_call
+from acts.test_utils.tel.tel_test_utils import wait_for_wfc_disabled
+from acts.test_utils.tel.tel_test_utils import wait_for_wfc_enabled
+from acts.test_utils.tel.tel_test_utils import wait_for_wifi_data_connection
+from acts.test_utils.tel.tel_test_utils import verify_http_connection
+from acts.test_utils.tel.tel_test_utils import get_telephony_signal_strength
+from acts.test_utils.tel.tel_test_utils import get_lte_rsrp
+from acts.test_utils.tel.tel_test_utils import get_wifi_signal_strength
+from acts.test_utils.tel.tel_test_utils import wait_for_state
+from acts.test_utils.tel.tel_test_utils import is_phone_in_call
+from acts.test_utils.tel.tel_test_utils import start_qxdm_loggers
+from acts.test_utils.tel.tel_test_utils import start_qxdm_logger
+from acts.test_utils.tel.tel_test_utils import active_file_download_test
+from acts.test_utils.tel.tel_test_utils import verify_internet_connection
+from acts.test_utils.tel.tel_test_utils import test_data_browsing_success_using_sl4a
+from acts.test_utils.tel.tel_test_utils import test_data_browsing_failure_using_sl4a
+from acts.test_utils.tel.tel_test_utils import sms_send_receive_verify
+from acts.test_utils.tel.tel_test_utils import mms_send_receive_verify
+from acts.test_utils.tel.tel_test_utils import get_operator_name
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_3g
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_2g
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_csfb
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_iwlan
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_not_iwlan
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_volte
+from acts.test_utils.tel.tel_voice_utils import phone_setup_voice_general
+from acts.test_utils.tel.tel_voice_utils import phone_setup_volte
+from acts.test_utils.tel.tel_voice_utils import phone_setup_voice_3g
+from acts.test_utils.tel.tel_voice_utils import phone_setup_voice_2g
+from acts.test_utils.tel.tel_voice_utils import phone_idle_3g
+from acts.test_utils.tel.tel_voice_utils import phone_idle_3g_for_subscription
+from acts.test_utils.tel.tel_voice_utils import phone_idle_2g
+from acts.test_utils.tel.tel_voice_utils import phone_idle_csfb
+from acts.test_utils.tel.tel_voice_utils import phone_idle_iwlan
+from acts.test_utils.tel.tel_voice_utils import phone_idle_not_iwlan
+from acts.test_utils.tel.tel_voice_utils import phone_idle_volte
+from acts.test_utils.tel.tel_voice_utils import phone_setup_3g
+from acts.test_utils.tel.tel_voice_utils import phone_setup_2g
+from acts.test_utils.tel.tel_subscription_utils import set_subid_for_outgoing_call
+from acts.test_utils.tel.tel_subscription_utils import set_incoming_voice_sub_id
+from acts.test_utils.tel.tel_subscription_utils import get_subid_from_slot_index
+from acts.test_utils.tel.tel_subscription_utils import get_operatorname_from_slot_index
+from acts.test_utils.tel.tel_subscription_utils import get_default_data_sub_id
+from acts.test_utils.tel.tel_subscription_utils import perform_dds_switch
+from acts.test_utils.tel.tel_subscription_utils import set_subid_for_data
+from acts.test_utils.tel.tel_subscription_utils import set_dds_on_slot_0
+from acts.test_utils.tel.tel_subscription_utils import set_dds_on_slot_1
+from acts.test_utils.tel.tel_subscription_utils import set_subid_for_message
+from acts.test_utils.tel.tel_subscription_utils import set_slways_allow_mms_data
from acts.utils import get_current_epoch_time
from acts.utils import rand_ascii_str
diff --git a/acts_tests/tests/google/tel/live/TelLiveDataTest.py b/acts_tests/tests/google/tel/live/TelLiveDataTest.py
index 6c8726d..efa1e9b 100755
--- a/acts_tests/tests/google/tel/live/TelLiveDataTest.py
+++ b/acts_tests/tests/google/tel/live/TelLiveDataTest.py
@@ -25,117 +25,117 @@
from acts import signals
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.tel.tel_subscription_utils import \
+from acts.test_utils.tel.tel_subscription_utils import \
get_subid_from_slot_index
-from acts_contrib.test_utils.bt.bt_test_utils import bluetooth_enabled_check
-from acts_contrib.test_utils.bt.bt_test_utils import disable_bluetooth
-from acts_contrib.test_utils.bt.bt_test_utils import pair_pri_to_sec
-from acts_contrib.test_utils.tel.tel_subscription_utils import set_subid_for_data
-from acts_contrib.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
-from acts_contrib.test_utils.tel.tel_defines import DIRECTION_MOBILE_ORIGINATED
-from acts_contrib.test_utils.tel.tel_defines import DIRECTION_MOBILE_TERMINATED
-from acts_contrib.test_utils.tel.tel_defines import DATA_STATE_CONNECTED
-from acts_contrib.test_utils.tel.tel_defines import FAKE_DATE_TIME
-from acts_contrib.test_utils.tel.tel_defines import FAKE_YEAR
-from acts_contrib.test_utils.tel.tel_defines import EventNetworkCallback
-from acts_contrib.test_utils.tel.tel_defines import NetworkCallbackCapabilitiesChanged
-from acts_contrib.test_utils.tel.tel_defines import NetworkCallbackLost
-from acts_contrib.test_utils.tel.tel_defines import GEN_2G
-from acts_contrib.test_utils.tel.tel_defines import GEN_3G
-from acts_contrib.test_utils.tel.tel_defines import GEN_4G
-from acts_contrib.test_utils.tel.tel_defines import NETWORK_SERVICE_DATA
-from acts_contrib.test_utils.tel.tel_defines import RAT_2G
-from acts_contrib.test_utils.tel.tel_defines import RAT_3G
-from acts_contrib.test_utils.tel.tel_defines import RAT_4G
-from acts_contrib.test_utils.tel.tel_defines import RAT_5G
-from acts_contrib.test_utils.tel.tel_defines import NETWORK_MODE_WCDMA_ONLY
-from acts_contrib.test_utils.tel.tel_defines import NETWORK_MODE_NR_LTE_GSM_WCDMA
-from acts_contrib.test_utils.tel.tel_defines import SIM1_SLOT_INDEX
-from acts_contrib.test_utils.tel.tel_defines import SIM2_SLOT_INDEX
-from acts_contrib.test_utils.tel.tel_defines import MAX_WAIT_TIME_NW_SELECTION
-from acts_contrib.test_utils.tel.tel_defines import MAX_WAIT_TIME_TETHERING_ENTITLEMENT_CHECK
-from acts_contrib.test_utils.tel.tel_defines import MAX_WAIT_TIME_WIFI_CONNECTION
-from acts_contrib.test_utils.tel.tel_defines import TETHERING_MODE_WIFI
-from acts_contrib.test_utils.tel.tel_defines import WAIT_TIME_AFTER_REBOOT
-from acts_contrib.test_utils.tel.tel_defines import WAIT_TIME_BETWEEN_STATE_CHECK
-from acts_contrib.test_utils.tel.tel_defines import WAIT_TIME_ANDROID_STATE_SETTLING
-from acts_contrib.test_utils.tel.tel_defines import MAX_WAIT_TIME_USER_PLANE_DATA
-from acts_contrib.test_utils.tel.tel_defines import WAIT_TIME_BETWEEN_REG_AND_CALL
-from acts_contrib.test_utils.tel.tel_defines import \
+from acts.test_utils.bt.bt_test_utils import bluetooth_enabled_check
+from acts.test_utils.bt.bt_test_utils import disable_bluetooth
+from acts.test_utils.bt.bt_test_utils import pair_pri_to_sec
+from acts.test_utils.tel.tel_subscription_utils import set_subid_for_data
+from acts.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
+from acts.test_utils.tel.tel_defines import DIRECTION_MOBILE_ORIGINATED
+from acts.test_utils.tel.tel_defines import DIRECTION_MOBILE_TERMINATED
+from acts.test_utils.tel.tel_defines import DATA_STATE_CONNECTED
+from acts.test_utils.tel.tel_defines import FAKE_DATE_TIME
+from acts.test_utils.tel.tel_defines import FAKE_YEAR
+from acts.test_utils.tel.tel_defines import EventNetworkCallback
+from acts.test_utils.tel.tel_defines import NetworkCallbackCapabilitiesChanged
+from acts.test_utils.tel.tel_defines import NetworkCallbackLost
+from acts.test_utils.tel.tel_defines import GEN_2G
+from acts.test_utils.tel.tel_defines import GEN_3G
+from acts.test_utils.tel.tel_defines import GEN_4G
+from acts.test_utils.tel.tel_defines import NETWORK_SERVICE_DATA
+from acts.test_utils.tel.tel_defines import RAT_2G
+from acts.test_utils.tel.tel_defines import RAT_3G
+from acts.test_utils.tel.tel_defines import RAT_4G
+from acts.test_utils.tel.tel_defines import RAT_5G
+from acts.test_utils.tel.tel_defines import NETWORK_MODE_WCDMA_ONLY
+from acts.test_utils.tel.tel_defines import NETWORK_MODE_NR_LTE_GSM_WCDMA
+from acts.test_utils.tel.tel_defines import SIM1_SLOT_INDEX
+from acts.test_utils.tel.tel_defines import SIM2_SLOT_INDEX
+from acts.test_utils.tel.tel_defines import MAX_WAIT_TIME_NW_SELECTION
+from acts.test_utils.tel.tel_defines import MAX_WAIT_TIME_TETHERING_ENTITLEMENT_CHECK
+from acts.test_utils.tel.tel_defines import MAX_WAIT_TIME_WIFI_CONNECTION
+from acts.test_utils.tel.tel_defines import TETHERING_MODE_WIFI
+from acts.test_utils.tel.tel_defines import WAIT_TIME_AFTER_REBOOT
+from acts.test_utils.tel.tel_defines import WAIT_TIME_BETWEEN_STATE_CHECK
+from acts.test_utils.tel.tel_defines import WAIT_TIME_ANDROID_STATE_SETTLING
+from acts.test_utils.tel.tel_defines import MAX_WAIT_TIME_USER_PLANE_DATA
+from acts.test_utils.tel.tel_defines import WAIT_TIME_BETWEEN_REG_AND_CALL
+from acts.test_utils.tel.tel_defines import \
WAIT_TIME_DATA_STATUS_CHANGE_DURING_WIFI_TETHERING
-from acts_contrib.test_utils.tel.tel_defines import WAIT_TIME_TETHERING_AFTER_REBOOT
-from acts_contrib.test_utils.tel.tel_data_utils import airplane_mode_test
-from acts_contrib.test_utils.tel.tel_data_utils import browsing_test
-from acts_contrib.test_utils.tel.tel_data_utils import reboot_test
-from acts_contrib.test_utils.tel.tel_data_utils import change_data_sim_and_verify_data
-from acts_contrib.test_utils.tel.tel_data_utils import data_connectivity_single_bearer
-from acts_contrib.test_utils.tel.tel_data_utils import tethering_check_internet_connection
-from acts_contrib.test_utils.tel.tel_data_utils import wifi_cell_switching
-from acts_contrib.test_utils.tel.tel_data_utils import wifi_tethering_cleanup
-from acts_contrib.test_utils.tel.tel_data_utils import wifi_tethering_setup_teardown
-from acts_contrib.test_utils.tel.tel_test_utils import active_file_download_test
-from acts_contrib.test_utils.tel.tel_test_utils import call_setup_teardown
-from acts_contrib.test_utils.tel.tel_test_utils import check_is_wifi_connected
-from acts_contrib.test_utils.tel.tel_test_utils import ensure_phones_default_state
-from acts_contrib.test_utils.tel.tel_test_utils import ensure_phones_idle
-from acts_contrib.test_utils.tel.tel_test_utils import ensure_network_generation
-from acts_contrib.test_utils.tel.tel_test_utils import \
+from acts.test_utils.tel.tel_defines import WAIT_TIME_TETHERING_AFTER_REBOOT
+from acts.test_utils.tel.tel_data_utils import airplane_mode_test
+from acts.test_utils.tel.tel_data_utils import browsing_test
+from acts.test_utils.tel.tel_data_utils import reboot_test
+from acts.test_utils.tel.tel_data_utils import change_data_sim_and_verify_data
+from acts.test_utils.tel.tel_data_utils import data_connectivity_single_bearer
+from acts.test_utils.tel.tel_data_utils import tethering_check_internet_connection
+from acts.test_utils.tel.tel_data_utils import wifi_cell_switching
+from acts.test_utils.tel.tel_data_utils import wifi_tethering_cleanup
+from acts.test_utils.tel.tel_data_utils import wifi_tethering_setup_teardown
+from acts.test_utils.tel.tel_test_utils import active_file_download_test
+from acts.test_utils.tel.tel_test_utils import call_setup_teardown
+from acts.test_utils.tel.tel_test_utils import check_is_wifi_connected
+from acts.test_utils.tel.tel_test_utils import ensure_phones_default_state
+from acts.test_utils.tel.tel_test_utils import ensure_phones_idle
+from acts.test_utils.tel.tel_test_utils import ensure_network_generation
+from acts.test_utils.tel.tel_test_utils import \
ensure_network_generation_for_subscription
-from acts_contrib.test_utils.tel.tel_test_utils import ensure_wifi_connected
-from acts_contrib.test_utils.tel.tel_test_utils import get_mobile_data_usage
-from acts_contrib.test_utils.tel.tel_test_utils import get_slot_index_from_subid
-from acts_contrib.test_utils.tel.tel_test_utils import hangup_call
-from acts_contrib.test_utils.tel.tel_test_utils import multithread_func
-from acts_contrib.test_utils.tel.tel_test_utils import reboot_device
-from acts_contrib.test_utils.tel.tel_test_utils import remove_mobile_data_usage_limit
-from acts_contrib.test_utils.tel.tel_test_utils import set_mobile_data_usage_limit
-from acts_contrib.test_utils.tel.tel_test_utils import stop_wifi_tethering
-from acts_contrib.test_utils.tel.tel_test_utils import start_wifi_tethering
-from acts_contrib.test_utils.tel.tel_test_utils import is_current_network_5g_nsa
-from acts_contrib.test_utils.tel.tel_test_utils import set_preferred_mode_for_5g
-from acts_contrib.test_utils.tel.tel_test_utils import get_current_override_network_type
-from acts_contrib.test_utils.tel.tel_test_utils import toggle_airplane_mode
-from acts_contrib.test_utils.tel.tel_test_utils import toggle_airplane_mode_by_adb
-from acts_contrib.test_utils.tel.tel_test_utils import verify_internet_connection
-from acts_contrib.test_utils.tel.tel_test_utils import verify_http_connection
-from acts_contrib.test_utils.tel.tel_test_utils import verify_incall_state
-from acts_contrib.test_utils.tel.tel_test_utils import wait_for_network_generation
-from acts_contrib.test_utils.tel.tel_test_utils import wait_for_cell_data_connection
-from acts_contrib.test_utils.tel.tel_test_utils import wait_for_network_rat
-from acts_contrib.test_utils.tel.tel_test_utils import \
+from acts.test_utils.tel.tel_test_utils import ensure_wifi_connected
+from acts.test_utils.tel.tel_test_utils import get_mobile_data_usage
+from acts.test_utils.tel.tel_test_utils import get_slot_index_from_subid
+from acts.test_utils.tel.tel_test_utils import hangup_call
+from acts.test_utils.tel.tel_test_utils import multithread_func
+from acts.test_utils.tel.tel_test_utils import reboot_device
+from acts.test_utils.tel.tel_test_utils import remove_mobile_data_usage_limit
+from acts.test_utils.tel.tel_test_utils import set_mobile_data_usage_limit
+from acts.test_utils.tel.tel_test_utils import stop_wifi_tethering
+from acts.test_utils.tel.tel_test_utils import start_wifi_tethering
+from acts.test_utils.tel.tel_test_utils import is_current_network_5g_nsa
+from acts.test_utils.tel.tel_test_utils import set_preferred_mode_for_5g
+from acts.test_utils.tel.tel_test_utils import get_current_override_network_type
+from acts.test_utils.tel.tel_test_utils import toggle_airplane_mode
+from acts.test_utils.tel.tel_test_utils import toggle_airplane_mode_by_adb
+from acts.test_utils.tel.tel_test_utils import verify_internet_connection
+from acts.test_utils.tel.tel_test_utils import verify_http_connection
+from acts.test_utils.tel.tel_test_utils import verify_incall_state
+from acts.test_utils.tel.tel_test_utils import wait_for_network_generation
+from acts.test_utils.tel.tel_test_utils import wait_for_cell_data_connection
+from acts.test_utils.tel.tel_test_utils import wait_for_network_rat
+from acts.test_utils.tel.tel_test_utils import \
wait_for_voice_attach_for_subscription
-from acts_contrib.test_utils.tel.tel_test_utils import \
+from acts.test_utils.tel.tel_test_utils import \
wait_for_data_attach_for_subscription
-from acts_contrib.test_utils.tel.tel_test_utils import wait_for_wifi_data_connection
-from acts_contrib.test_utils.tel.tel_test_utils import wifi_reset
-from acts_contrib.test_utils.tel.tel_test_utils import wait_for_state
-from acts_contrib.test_utils.tel.tel_test_utils import wifi_toggle_state
-from acts_contrib.test_utils.tel.tel_test_utils import WIFI_CONFIG_APBAND_2G
-from acts_contrib.test_utils.tel.tel_test_utils import WIFI_CONFIG_APBAND_5G
-from acts_contrib.test_utils.tel.tel_test_utils import WIFI_SSID_KEY
-from acts_contrib.test_utils.tel.tel_test_utils import check_data_stall_detection
-from acts_contrib.test_utils.tel.tel_test_utils import check_network_validation_fail
-from acts_contrib.test_utils.tel.tel_test_utils import break_internet_except_sl4a_port
-from acts_contrib.test_utils.tel.tel_test_utils import resume_internet_with_sl4a_port
-from acts_contrib.test_utils.tel.tel_test_utils import set_preferred_network_mode_pref
-from acts_contrib.test_utils.tel.tel_test_utils import get_device_epoch_time
-from acts_contrib.test_utils.tel.tel_test_utils import check_data_stall_recovery
-from acts_contrib.test_utils.tel.tel_test_utils import \
+from acts.test_utils.tel.tel_test_utils import wait_for_wifi_data_connection
+from acts.test_utils.tel.tel_test_utils import wifi_reset
+from acts.test_utils.tel.tel_test_utils import wait_for_state
+from acts.test_utils.tel.tel_test_utils import wifi_toggle_state
+from acts.test_utils.tel.tel_test_utils import WIFI_CONFIG_APBAND_2G
+from acts.test_utils.tel.tel_test_utils import WIFI_CONFIG_APBAND_5G
+from acts.test_utils.tel.tel_test_utils import WIFI_SSID_KEY
+from acts.test_utils.tel.tel_test_utils import check_data_stall_detection
+from acts.test_utils.tel.tel_test_utils import check_network_validation_fail
+from acts.test_utils.tel.tel_test_utils import break_internet_except_sl4a_port
+from acts.test_utils.tel.tel_test_utils import resume_internet_with_sl4a_port
+from acts.test_utils.tel.tel_test_utils import set_preferred_network_mode_pref
+from acts.test_utils.tel.tel_test_utils import get_device_epoch_time
+from acts.test_utils.tel.tel_test_utils import check_data_stall_recovery
+from acts.test_utils.tel.tel_test_utils import \
test_data_browsing_success_using_sl4a
-from acts_contrib.test_utils.tel.tel_test_utils import \
+from acts.test_utils.tel.tel_test_utils import \
test_data_browsing_failure_using_sl4a
-from acts_contrib.test_utils.tel.tel_test_utils import set_time_sync_from_network
-from acts_contrib.test_utils.tel.tel_test_utils import datetime_handle
-from acts_contrib.test_utils.tel.tel_voice_utils import is_phone_in_call_3g
-from acts_contrib.test_utils.tel.tel_voice_utils import is_phone_in_call_csfb
-from acts_contrib.test_utils.tel.tel_voice_utils import is_phone_in_call_volte
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_3g
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_voice_3g
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_csfb
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_voice_general
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_volte
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_4g
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_5g
+from acts.test_utils.tel.tel_test_utils import set_time_sync_from_network
+from acts.test_utils.tel.tel_test_utils import datetime_handle
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_3g
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_csfb
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_volte
+from acts.test_utils.tel.tel_voice_utils import phone_setup_3g
+from acts.test_utils.tel.tel_voice_utils import phone_setup_voice_3g
+from acts.test_utils.tel.tel_voice_utils import phone_setup_csfb
+from acts.test_utils.tel.tel_voice_utils import phone_setup_voice_general
+from acts.test_utils.tel.tel_voice_utils import phone_setup_volte
+from acts.test_utils.tel.tel_voice_utils import phone_setup_4g
+from acts.test_utils.tel.tel_voice_utils import phone_setup_5g
from acts.utils import disable_doze
from acts.utils import enable_doze
from acts.utils import rand_ascii_str
diff --git a/acts_tests/tests/google/tel/live/TelLiveEmergencyBase.py b/acts_tests/tests/google/tel/live/TelLiveEmergencyBase.py
index edb8b39..e1ec0e2 100644
--- a/acts_tests/tests/google/tel/live/TelLiveEmergencyBase.py
+++ b/acts_tests/tests/google/tel/live/TelLiveEmergencyBase.py
@@ -21,36 +21,36 @@
import time
from acts import signals
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
-from acts_contrib.test_utils.tel.tel_defines import CAPABILITY_WFC
-from acts_contrib.test_utils.tel.tel_defines import DEFAULT_DEVICE_PASSWORD
-from acts_contrib.test_utils.tel.tel_defines import PHONE_TYPE_CDMA
-from acts_contrib.test_utils.tel.tel_defines import WFC_MODE_WIFI_PREFERRED
-from acts_contrib.test_utils.tel.tel_lookup_tables import operator_capabilities
-from acts_contrib.test_utils.tel.tel_test_utils import abort_all_tests
-from acts_contrib.test_utils.tel.tel_test_utils import call_setup_teardown
-from acts_contrib.test_utils.tel.tel_test_utils import dumpsys_last_call_info
-from acts_contrib.test_utils.tel.tel_test_utils import dumpsys_last_call_number
-from acts_contrib.test_utils.tel.tel_test_utils import dumpsys_new_call_info
-from acts_contrib.test_utils.tel.tel_test_utils import ensure_phone_default_state
-from acts_contrib.test_utils.tel.tel_test_utils import get_operator_name
-from acts_contrib.test_utils.tel.tel_test_utils import get_service_state_by_adb
-from acts_contrib.test_utils.tel.tel_test_utils import fastboot_wipe
-from acts_contrib.test_utils.tel.tel_test_utils import hangup_call_by_adb
-from acts_contrib.test_utils.tel.tel_test_utils import initiate_call
-from acts_contrib.test_utils.tel.tel_test_utils import is_sim_lock_enabled
-from acts_contrib.test_utils.tel.tel_test_utils import initiate_emergency_dialer_call_by_adb
-from acts_contrib.test_utils.tel.tel_test_utils import last_call_drop_reason
-from acts_contrib.test_utils.tel.tel_test_utils import reset_device_password
-from acts_contrib.test_utils.tel.tel_test_utils import toggle_airplane_mode_by_adb
-from acts_contrib.test_utils.tel.tel_test_utils import unlock_sim
-from acts_contrib.test_utils.tel.tel_test_utils import verify_internet_connection
-from acts_contrib.test_utils.tel.tel_test_utils import wait_for_cell_data_connection
-from acts_contrib.test_utils.tel.tel_test_utils import wait_for_sim_ready_by_adb
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_csfb
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_iwlan
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_voice_3g
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_voice_2g
+from acts.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
+from acts.test_utils.tel.tel_defines import CAPABILITY_WFC
+from acts.test_utils.tel.tel_defines import DEFAULT_DEVICE_PASSWORD
+from acts.test_utils.tel.tel_defines import PHONE_TYPE_CDMA
+from acts.test_utils.tel.tel_defines import WFC_MODE_WIFI_PREFERRED
+from acts.test_utils.tel.tel_lookup_tables import operator_capabilities
+from acts.test_utils.tel.tel_test_utils import abort_all_tests
+from acts.test_utils.tel.tel_test_utils import call_setup_teardown
+from acts.test_utils.tel.tel_test_utils import dumpsys_last_call_info
+from acts.test_utils.tel.tel_test_utils import dumpsys_last_call_number
+from acts.test_utils.tel.tel_test_utils import dumpsys_new_call_info
+from acts.test_utils.tel.tel_test_utils import ensure_phone_default_state
+from acts.test_utils.tel.tel_test_utils import get_operator_name
+from acts.test_utils.tel.tel_test_utils import get_service_state_by_adb
+from acts.test_utils.tel.tel_test_utils import fastboot_wipe
+from acts.test_utils.tel.tel_test_utils import hangup_call_by_adb
+from acts.test_utils.tel.tel_test_utils import initiate_call
+from acts.test_utils.tel.tel_test_utils import is_sim_lock_enabled
+from acts.test_utils.tel.tel_test_utils import initiate_emergency_dialer_call_by_adb
+from acts.test_utils.tel.tel_test_utils import last_call_drop_reason
+from acts.test_utils.tel.tel_test_utils import reset_device_password
+from acts.test_utils.tel.tel_test_utils import toggle_airplane_mode_by_adb
+from acts.test_utils.tel.tel_test_utils import unlock_sim
+from acts.test_utils.tel.tel_test_utils import verify_internet_connection
+from acts.test_utils.tel.tel_test_utils import wait_for_cell_data_connection
+from acts.test_utils.tel.tel_test_utils import wait_for_sim_ready_by_adb
+from acts.test_utils.tel.tel_voice_utils import phone_setup_csfb
+from acts.test_utils.tel.tel_voice_utils import phone_setup_iwlan
+from acts.test_utils.tel.tel_voice_utils import phone_setup_voice_3g
+from acts.test_utils.tel.tel_voice_utils import phone_setup_voice_2g
from acts.utils import get_current_epoch_time
CARRIER_OVERRIDE_CMD = (
diff --git a/acts_tests/tests/google/tel/live/TelLiveEmergencyTest.py b/acts_tests/tests/google/tel/live/TelLiveEmergencyTest.py
index e29ed7a..4f21ee5 100644
--- a/acts_tests/tests/google/tel/live/TelLiveEmergencyTest.py
+++ b/acts_tests/tests/google/tel/live/TelLiveEmergencyTest.py
@@ -19,19 +19,19 @@
from acts import signals
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
-from acts_contrib.test_utils.tel.tel_defines import CAPABILITY_WFC
-from acts_contrib.test_utils.tel.tel_defines import DEFAULT_DEVICE_PASSWORD
-from acts_contrib.test_utils.tel.tel_defines import WFC_MODE_WIFI_PREFERRED
-from acts_contrib.test_utils.tel.tel_lookup_tables import operator_capabilities
-from acts_contrib.test_utils.tel.tel_test_utils import fastboot_wipe
-from acts_contrib.test_utils.tel.tel_test_utils import reset_device_password
-from acts_contrib.test_utils.tel.tel_test_utils import toggle_airplane_mode_by_adb
-from acts_contrib.test_utils.tel.tel_test_utils import wait_for_sim_ready_by_adb
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_csfb
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_iwlan
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_voice_3g
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_voice_2g
+from acts.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
+from acts.test_utils.tel.tel_defines import CAPABILITY_WFC
+from acts.test_utils.tel.tel_defines import DEFAULT_DEVICE_PASSWORD
+from acts.test_utils.tel.tel_defines import WFC_MODE_WIFI_PREFERRED
+from acts.test_utils.tel.tel_lookup_tables import operator_capabilities
+from acts.test_utils.tel.tel_test_utils import fastboot_wipe
+from acts.test_utils.tel.tel_test_utils import reset_device_password
+from acts.test_utils.tel.tel_test_utils import toggle_airplane_mode_by_adb
+from acts.test_utils.tel.tel_test_utils import wait_for_sim_ready_by_adb
+from acts.test_utils.tel.tel_voice_utils import phone_setup_csfb
+from acts.test_utils.tel.tel_voice_utils import phone_setup_iwlan
+from acts.test_utils.tel.tel_voice_utils import phone_setup_voice_3g
+from acts.test_utils.tel.tel_voice_utils import phone_setup_voice_2g
from TelLiveEmergencyBase import TelLiveEmergencyBase
diff --git a/acts_tests/tests/google/tel/live/TelLiveGFTDSDSDDSSwitchTest.py b/acts_tests/tests/google/tel/live/TelLiveGFTDSDSDDSSwitchTest.py
index 2734fed..dc53fd6 100644
--- a/acts_tests/tests/google/tel/live/TelLiveGFTDSDSDDSSwitchTest.py
+++ b/acts_tests/tests/google/tel/live/TelLiveGFTDSDSDDSSwitchTest.py
@@ -20,54 +20,54 @@
from acts import asserts
from acts import signals
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.tel.loggers.protos.telephony_metric_pb2 import \
+from acts.test_utils.tel.loggers.protos.telephony_metric_pb2 import \
TelephonyVoiceTestResult
-from acts_contrib.test_utils.tel.loggers.telephony_metric_logger import \
+from acts.test_utils.tel.loggers.telephony_metric_logger import \
TelephonyMetricLogger
-from acts_contrib.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
-from acts_contrib.test_utils.tel.tel_defines import MAX_WAIT_TIME_SMS_RECEIVE
-from acts_contrib.test_utils.tel.tel_defines import WAIT_TIME_IN_CALL
-from acts_contrib.test_utils.tel.tel_defines import WAIT_TIME_ANDROID_STATE_SETTLING
-from acts_contrib.test_utils.tel.tel_defines import INVALID_SUB_ID
-from acts_contrib.test_utils.tel.tel_defines import WFC_MODE_DISABLED
-from acts_contrib.test_utils.tel.tel_defines import WFC_MODE_CELLULAR_PREFERRED
-from acts_contrib.test_utils.tel.tel_defines import WFC_MODE_WIFI_ONLY
-from acts_contrib.test_utils.tel.tel_defines import WFC_MODE_WIFI_PREFERRED
-from acts_contrib.test_utils.tel.tel_data_utils import reboot_test
-from acts_contrib.test_utils.tel.tel_subscription_utils import get_subid_from_slot_index
-from acts_contrib.test_utils.tel.tel_subscription_utils import get_default_data_sub_id
-from acts_contrib.test_utils.tel.tel_subscription_utils import set_message_subid
-from acts_contrib.test_utils.tel.tel_subscription_utils import set_subid_for_data
-from acts_contrib.test_utils.tel.tel_subscription_utils import set_voice_sub_id
-from acts_contrib.test_utils.tel.tel_subscription_utils import set_dds_on_slot_0
-from acts_contrib.test_utils.tel.tel_subscription_utils import set_dds_on_slot_1
-from acts_contrib.test_utils.tel.tel_subscription_utils import \
+from acts.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
+from acts.test_utils.tel.tel_defines import MAX_WAIT_TIME_SMS_RECEIVE
+from acts.test_utils.tel.tel_defines import WAIT_TIME_IN_CALL
+from acts.test_utils.tel.tel_defines import WAIT_TIME_ANDROID_STATE_SETTLING
+from acts.test_utils.tel.tel_defines import INVALID_SUB_ID
+from acts.test_utils.tel.tel_defines import WFC_MODE_DISABLED
+from acts.test_utils.tel.tel_defines import WFC_MODE_CELLULAR_PREFERRED
+from acts.test_utils.tel.tel_defines import WFC_MODE_WIFI_ONLY
+from acts.test_utils.tel.tel_defines import WFC_MODE_WIFI_PREFERRED
+from acts.test_utils.tel.tel_data_utils import reboot_test
+from acts.test_utils.tel.tel_subscription_utils import get_subid_from_slot_index
+from acts.test_utils.tel.tel_subscription_utils import get_default_data_sub_id
+from acts.test_utils.tel.tel_subscription_utils import set_message_subid
+from acts.test_utils.tel.tel_subscription_utils import set_subid_for_data
+from acts.test_utils.tel.tel_subscription_utils import set_voice_sub_id
+from acts.test_utils.tel.tel_subscription_utils import set_dds_on_slot_0
+from acts.test_utils.tel.tel_subscription_utils import set_dds_on_slot_1
+from acts.test_utils.tel.tel_subscription_utils import \
get_subid_on_same_network_of_host_ad
-from acts_contrib.test_utils.tel.tel_test_utils import multithread_func
-from acts_contrib.test_utils.tel.tel_test_utils import start_youtube_video
-from acts_contrib.test_utils.tel.tel_test_utils import \
+from acts.test_utils.tel.tel_test_utils import multithread_func
+from acts.test_utils.tel.tel_test_utils import start_youtube_video
+from acts.test_utils.tel.tel_test_utils import \
wait_for_cell_data_connection_for_subscription
-from acts_contrib.test_utils.tel.tel_test_utils import toggle_volte_for_subscription
-from acts_contrib.test_utils.tel.tel_test_utils import toggle_wfc_for_subscription
-from acts_contrib.test_utils.tel.tel_test_utils import set_wfc_mode_for_subscription
-from acts_contrib.test_utils.tel.tel_test_utils import \
+from acts.test_utils.tel.tel_test_utils import toggle_volte_for_subscription
+from acts.test_utils.tel.tel_test_utils import toggle_wfc_for_subscription
+from acts.test_utils.tel.tel_test_utils import set_wfc_mode_for_subscription
+from acts.test_utils.tel.tel_test_utils import \
sms_send_receive_verify_for_subscription
-from acts_contrib.test_utils.tel.tel_test_utils import mms_send_receive_verify
-from acts_contrib.test_utils.tel.tel_test_utils import verify_http_connection
-from acts_contrib.test_utils.tel.tel_test_utils import verify_internet_connection
-from acts_contrib.test_utils.tel.tel_test_utils import log_messaging_screen_shot
-from acts_contrib.test_utils.tel.tel_test_utils import ensure_phones_idle
-from acts_contrib.test_utils.tel.tel_test_utils import get_slot_index_from_subid
-from acts_contrib.test_utils.tel.tel_test_utils import toggle_airplane_mode
-from acts_contrib.test_utils.tel.tel_test_utils import is_volte_enabled
-from acts_contrib.test_utils.tel.tel_test_utils import check_is_wifi_connected
-from acts_contrib.test_utils.tel.tel_test_utils import ensure_wifi_connected
-from acts_contrib.test_utils.tel.tel_test_utils import wait_for_wfc_enabled
-from acts_contrib.test_utils.tel.tel_voice_utils import \
+from acts.test_utils.tel.tel_test_utils import mms_send_receive_verify
+from acts.test_utils.tel.tel_test_utils import verify_http_connection
+from acts.test_utils.tel.tel_test_utils import verify_internet_connection
+from acts.test_utils.tel.tel_test_utils import log_messaging_screen_shot
+from acts.test_utils.tel.tel_test_utils import ensure_phones_idle
+from acts.test_utils.tel.tel_test_utils import get_slot_index_from_subid
+from acts.test_utils.tel.tel_test_utils import toggle_airplane_mode
+from acts.test_utils.tel.tel_test_utils import is_volte_enabled
+from acts.test_utils.tel.tel_test_utils import check_is_wifi_connected
+from acts.test_utils.tel.tel_test_utils import ensure_wifi_connected
+from acts.test_utils.tel.tel_test_utils import wait_for_wfc_enabled
+from acts.test_utils.tel.tel_voice_utils import \
phone_setup_volte_for_subscription
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_on_rat
-from acts_contrib.test_utils.tel.tel_voice_utils import is_phone_in_call_on_rat
-from acts_contrib.test_utils.tel.tel_voice_utils import two_phone_call_msim_for_slot
+from acts.test_utils.tel.tel_voice_utils import phone_setup_on_rat
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_on_rat
+from acts.test_utils.tel.tel_voice_utils import two_phone_call_msim_for_slot
from acts.utils import rand_ascii_str
CallResult = TelephonyVoiceTestResult.CallResult.Value
diff --git a/acts_tests/tests/google/tel/live/TelLiveGFTDSDSMessageTest.py b/acts_tests/tests/google/tel/live/TelLiveGFTDSDSMessageTest.py
index b735184..82ef7ca 100644
--- a/acts_tests/tests/google/tel/live/TelLiveGFTDSDSMessageTest.py
+++ b/acts_tests/tests/google/tel/live/TelLiveGFTDSDSMessageTest.py
@@ -19,45 +19,45 @@
from acts import asserts
from acts import signals
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.tel.loggers.protos.telephony_metric_pb2 import \
+from acts.test_utils.tel.loggers.protos.telephony_metric_pb2 import \
TelephonyVoiceTestResult
-from acts_contrib.test_utils.tel.loggers.telephony_metric_logger import \
+from acts.test_utils.tel.loggers.telephony_metric_logger import \
TelephonyMetricLogger
-from acts_contrib.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
-from acts_contrib.test_utils.tel.tel_defines import MAX_WAIT_TIME_SMS_RECEIVE
-from acts_contrib.test_utils.tel.tel_defines import WAIT_TIME_ANDROID_STATE_SETTLING
-from acts_contrib.test_utils.tel.tel_defines import INVALID_SUB_ID
-from acts_contrib.test_utils.tel.tel_subscription_utils import \
+from acts.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
+from acts.test_utils.tel.tel_defines import MAX_WAIT_TIME_SMS_RECEIVE
+from acts.test_utils.tel.tel_defines import WAIT_TIME_ANDROID_STATE_SETTLING
+from acts.test_utils.tel.tel_defines import INVALID_SUB_ID
+from acts.test_utils.tel.tel_subscription_utils import \
get_incoming_voice_sub_id
-from acts_contrib.test_utils.tel.tel_subscription_utils import get_subid_from_slot_index
-from acts_contrib.test_utils.tel.tel_subscription_utils import \
+from acts.test_utils.tel.tel_subscription_utils import get_subid_from_slot_index
+from acts.test_utils.tel.tel_subscription_utils import \
get_outgoing_message_sub_id
-from acts_contrib.test_utils.tel.tel_subscription_utils import get_default_data_sub_id
-from acts_contrib.test_utils.tel.tel_subscription_utils import set_message_subid
-from acts_contrib.test_utils.tel.tel_subscription_utils import set_subid_for_data
-from acts_contrib.test_utils.tel.tel_subscription_utils import set_voice_sub_id
-from acts_contrib.test_utils.tel.tel_subscription_utils import set_dds_on_slot_0
-from acts_contrib.test_utils.tel.tel_subscription_utils import set_dds_on_slot_1
-from acts_contrib.test_utils.tel.tel_subscription_utils import \
+from acts.test_utils.tel.tel_subscription_utils import get_default_data_sub_id
+from acts.test_utils.tel.tel_subscription_utils import set_message_subid
+from acts.test_utils.tel.tel_subscription_utils import set_subid_for_data
+from acts.test_utils.tel.tel_subscription_utils import set_voice_sub_id
+from acts.test_utils.tel.tel_subscription_utils import set_dds_on_slot_0
+from acts.test_utils.tel.tel_subscription_utils import set_dds_on_slot_1
+from acts.test_utils.tel.tel_subscription_utils import \
get_subid_on_same_network_of_host_ad
-from acts_contrib.test_utils.tel.tel_test_utils import multithread_func
-from acts_contrib.test_utils.tel.tel_test_utils import \
+from acts.test_utils.tel.tel_test_utils import multithread_func
+from acts.test_utils.tel.tel_test_utils import \
sms_send_receive_verify_for_subscription
-from acts_contrib.test_utils.tel.tel_test_utils import \
+from acts.test_utils.tel.tel_test_utils import \
sms_in_collision_send_receive_verify_for_subscription
-from acts_contrib.test_utils.tel.tel_test_utils import \
+from acts.test_utils.tel.tel_test_utils import \
sms_rx_power_off_multiple_send_receive_verify_for_subscription
-from acts_contrib.test_utils.tel.tel_test_utils import \
+from acts.test_utils.tel.tel_test_utils import \
voice_call_in_collision_with_mt_sms_msim
-from acts_contrib.test_utils.tel.tel_test_utils import mms_send_receive_verify
-from acts_contrib.test_utils.tel.tel_test_utils import verify_http_connection
-from acts_contrib.test_utils.tel.tel_test_utils import log_messaging_screen_shot
-from acts_contrib.test_utils.tel.tel_test_utils import ensure_phones_idle
-from acts_contrib.test_utils.tel.tel_test_utils import get_slot_index_from_subid
-from acts_contrib.test_utils.tel.tel_voice_utils import \
+from acts.test_utils.tel.tel_test_utils import mms_send_receive_verify
+from acts.test_utils.tel.tel_test_utils import verify_http_connection
+from acts.test_utils.tel.tel_test_utils import log_messaging_screen_shot
+from acts.test_utils.tel.tel_test_utils import ensure_phones_idle
+from acts.test_utils.tel.tel_test_utils import get_slot_index_from_subid
+from acts.test_utils.tel.tel_voice_utils import \
phone_setup_voice_general_for_subscription
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_on_rat
-from acts_contrib.test_utils.tel.tel_voice_utils import is_phone_in_call_on_rat
+from acts.test_utils.tel.tel_voice_utils import phone_setup_on_rat
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_on_rat
from acts.utils import rand_ascii_str
CallResult = TelephonyVoiceTestResult.CallResult.Value
diff --git a/acts_tests/tests/google/tel/live/TelLiveGFTDSDSSupplementaryServiceTest.py b/acts_tests/tests/google/tel/live/TelLiveGFTDSDSSupplementaryServiceTest.py
index aae30c3..f7af340 100644
--- a/acts_tests/tests/google/tel/live/TelLiveGFTDSDSSupplementaryServiceTest.py
+++ b/acts_tests/tests/google/tel/live/TelLiveGFTDSDSSupplementaryServiceTest.py
@@ -20,49 +20,49 @@
from acts import asserts
from acts import signals
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.tel.loggers.protos.telephony_metric_pb2 import \
+from acts.test_utils.tel.loggers.protos.telephony_metric_pb2 import \
TelephonyVoiceTestResult
-from acts_contrib.test_utils.tel.loggers.telephony_metric_logger import \
+from acts.test_utils.tel.loggers.telephony_metric_logger import \
TelephonyMetricLogger
-from acts_contrib.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
-from acts_contrib.test_utils.tel.tel_defines import CALL_CAPABILITY_MANAGE_CONFERENCE
-from acts_contrib.test_utils.tel.tel_defines import CALL_PROPERTY_CONFERENCE
-from acts_contrib.test_utils.tel.tel_defines import CALL_STATE_ACTIVE
-from acts_contrib.test_utils.tel.tel_defines import CAPABILITY_CONFERENCE
-from acts_contrib.test_utils.tel.tel_defines import WAIT_TIME_IN_CALL
-from acts_contrib.test_utils.tel.tel_defines import INVALID_SUB_ID
-from acts_contrib.test_utils.tel.tel_subscription_utils import \
+from acts.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
+from acts.test_utils.tel.tel_defines import CALL_CAPABILITY_MANAGE_CONFERENCE
+from acts.test_utils.tel.tel_defines import CALL_PROPERTY_CONFERENCE
+from acts.test_utils.tel.tel_defines import CALL_STATE_ACTIVE
+from acts.test_utils.tel.tel_defines import CAPABILITY_CONFERENCE
+from acts.test_utils.tel.tel_defines import WAIT_TIME_IN_CALL
+from acts.test_utils.tel.tel_defines import INVALID_SUB_ID
+from acts.test_utils.tel.tel_subscription_utils import \
get_incoming_voice_sub_id
-from acts_contrib.test_utils.tel.tel_subscription_utils import \
+from acts.test_utils.tel.tel_subscription_utils import \
get_outgoing_voice_sub_id
-from acts_contrib.test_utils.tel.tel_subscription_utils import get_subid_from_slot_index
-from acts_contrib.test_utils.tel.tel_subscription_utils import set_voice_sub_id
-from acts_contrib.test_utils.tel.tel_subscription_utils import set_dds_on_slot_0
-from acts_contrib.test_utils.tel.tel_subscription_utils import set_dds_on_slot_1
-from acts_contrib.test_utils.tel.tel_subscription_utils import \
+from acts.test_utils.tel.tel_subscription_utils import get_subid_from_slot_index
+from acts.test_utils.tel.tel_subscription_utils import set_voice_sub_id
+from acts.test_utils.tel.tel_subscription_utils import set_dds_on_slot_0
+from acts.test_utils.tel.tel_subscription_utils import set_dds_on_slot_1
+from acts.test_utils.tel.tel_subscription_utils import \
get_subid_on_same_network_of_host_ad
-from acts_contrib.test_utils.tel.tel_test_utils import call_setup_teardown
-from acts_contrib.test_utils.tel.tel_test_utils import hangup_call
-from acts_contrib.test_utils.tel.tel_test_utils import multithread_func
-from acts_contrib.test_utils.tel.tel_test_utils import num_active_calls
-from acts_contrib.test_utils.tel.tel_test_utils import verify_incall_state
-from acts_contrib.test_utils.tel.tel_test_utils import get_capability_for_subscription
-from acts_contrib.test_utils.tel.tel_test_utils import verify_http_connection
-from acts_contrib.test_utils.tel.tel_test_utils import set_call_waiting
-from acts_contrib.test_utils.tel.tel_test_utils import ensure_phones_idle
-from acts_contrib.test_utils.tel.tel_test_utils import initiate_call
-from acts_contrib.test_utils.tel.tel_test_utils import \
+from acts.test_utils.tel.tel_test_utils import call_setup_teardown
+from acts.test_utils.tel.tel_test_utils import hangup_call
+from acts.test_utils.tel.tel_test_utils import multithread_func
+from acts.test_utils.tel.tel_test_utils import num_active_calls
+from acts.test_utils.tel.tel_test_utils import verify_incall_state
+from acts.test_utils.tel.tel_test_utils import get_capability_for_subscription
+from acts.test_utils.tel.tel_test_utils import verify_http_connection
+from acts.test_utils.tel.tel_test_utils import set_call_waiting
+from acts.test_utils.tel.tel_test_utils import ensure_phones_idle
+from acts.test_utils.tel.tel_test_utils import initiate_call
+from acts.test_utils.tel.tel_test_utils import \
wait_and_reject_call_for_subscription
-from acts_contrib.test_utils.tel.tel_test_utils import erase_call_forwarding_by_mmi
-from acts_contrib.test_utils.tel.tel_test_utils import get_operator_name
-from acts_contrib.test_utils.tel.tel_voice_utils import get_cep_conference_call_id
-from acts_contrib.test_utils.tel.tel_voice_utils import \
+from acts.test_utils.tel.tel_test_utils import erase_call_forwarding_by_mmi
+from acts.test_utils.tel.tel_test_utils import get_operator_name
+from acts.test_utils.tel.tel_voice_utils import get_cep_conference_call_id
+from acts.test_utils.tel.tel_voice_utils import \
three_phone_call_forwarding_short_seq
-from acts_contrib.test_utils.tel.tel_voice_utils import \
+from acts.test_utils.tel.tel_voice_utils import \
three_phone_call_waiting_short_seq
-from acts_contrib.test_utils.tel.tel_voice_utils import swap_calls
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_on_rat
-from acts_contrib.test_utils.tel.tel_voice_utils import is_phone_in_call_on_rat
+from acts.test_utils.tel.tel_voice_utils import swap_calls
+from acts.test_utils.tel.tel_voice_utils import phone_setup_on_rat
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_on_rat
CallResult = TelephonyVoiceTestResult.CallResult.Value
diff --git a/acts_tests/tests/google/tel/live/TelLiveGFTDSDSVoiceTest.py b/acts_tests/tests/google/tel/live/TelLiveGFTDSDSVoiceTest.py
index f984ed7..43baf79 100644
--- a/acts_tests/tests/google/tel/live/TelLiveGFTDSDSVoiceTest.py
+++ b/acts_tests/tests/google/tel/live/TelLiveGFTDSDSVoiceTest.py
@@ -17,35 +17,35 @@
from acts import asserts
from acts import signals
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.tel.loggers.protos.telephony_metric_pb2 import \
+from acts.test_utils.tel.loggers.protos.telephony_metric_pb2 import \
TelephonyVoiceTestResult
-from acts_contrib.test_utils.tel.loggers.telephony_metric_logger import \
+from acts.test_utils.tel.loggers.telephony_metric_logger import \
TelephonyMetricLogger
-from acts_contrib.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
-from acts_contrib.test_utils.tel.tel_defines import CAPABILITY_CONFERENCE
-from acts_contrib.test_utils.tel.tel_defines import INVALID_SUB_ID
-from acts_contrib.test_utils.tel.tel_subscription_utils import \
+from acts.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
+from acts.test_utils.tel.tel_defines import CAPABILITY_CONFERENCE
+from acts.test_utils.tel.tel_defines import INVALID_SUB_ID
+from acts.test_utils.tel.tel_subscription_utils import \
get_incoming_voice_sub_id
-from acts_contrib.test_utils.tel.tel_subscription_utils import \
+from acts.test_utils.tel.tel_subscription_utils import \
get_outgoing_voice_sub_id
-from acts_contrib.test_utils.tel.tel_subscription_utils import get_subid_from_slot_index
-from acts_contrib.test_utils.tel.tel_subscription_utils import set_voice_sub_id
-from acts_contrib.test_utils.tel.tel_subscription_utils import set_dds_on_slot_0
-from acts_contrib.test_utils.tel.tel_subscription_utils import set_dds_on_slot_1
-from acts_contrib.test_utils.tel.tel_subscription_utils import \
+from acts.test_utils.tel.tel_subscription_utils import get_subid_from_slot_index
+from acts.test_utils.tel.tel_subscription_utils import set_voice_sub_id
+from acts.test_utils.tel.tel_subscription_utils import set_dds_on_slot_0
+from acts.test_utils.tel.tel_subscription_utils import set_dds_on_slot_1
+from acts.test_utils.tel.tel_subscription_utils import \
get_subid_on_same_network_of_host_ad
-from acts_contrib.test_utils.tel.tel_test_utils import hangup_call
-from acts_contrib.test_utils.tel.tel_test_utils import multithread_func
-from acts_contrib.test_utils.tel.tel_test_utils import get_capability_for_subscription
-from acts_contrib.test_utils.tel.tel_test_utils import verify_http_connection
-from acts_contrib.test_utils.tel.tel_test_utils import ensure_phones_idle
-from acts_contrib.test_utils.tel.tel_test_utils import get_slot_index_from_subid
-from acts_contrib.test_utils.tel.tel_test_utils import get_operator_name
-from acts_contrib.test_utils.tel.tel_voice_utils import \
+from acts.test_utils.tel.tel_test_utils import hangup_call
+from acts.test_utils.tel.tel_test_utils import multithread_func
+from acts.test_utils.tel.tel_test_utils import get_capability_for_subscription
+from acts.test_utils.tel.tel_test_utils import verify_http_connection
+from acts.test_utils.tel.tel_test_utils import ensure_phones_idle
+from acts.test_utils.tel.tel_test_utils import get_slot_index_from_subid
+from acts.test_utils.tel.tel_test_utils import get_operator_name
+from acts.test_utils.tel.tel_voice_utils import \
phone_setup_voice_general_for_subscription
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_on_rat
-from acts_contrib.test_utils.tel.tel_voice_utils import is_phone_in_call_on_rat
-from acts_contrib.test_utils.tel.tel_voice_utils import two_phone_call_msim_for_slot
+from acts.test_utils.tel.tel_voice_utils import phone_setup_on_rat
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_on_rat
+from acts.test_utils.tel.tel_voice_utils import two_phone_call_msim_for_slot
CallResult = TelephonyVoiceTestResult.CallResult.Value
diff --git a/acts_tests/tests/google/tel/live/TelLiveGFTDSDSWfcSupplementaryServiceTest.py b/acts_tests/tests/google/tel/live/TelLiveGFTDSDSWfcSupplementaryServiceTest.py
index acdb8eb..a5f10e5 100644
--- a/acts_tests/tests/google/tel/live/TelLiveGFTDSDSWfcSupplementaryServiceTest.py
+++ b/acts_tests/tests/google/tel/live/TelLiveGFTDSDSWfcSupplementaryServiceTest.py
@@ -20,74 +20,74 @@
from acts import asserts
from acts import signals
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.tel.loggers.protos.telephony_metric_pb2 import \
+from acts.test_utils.tel.loggers.protos.telephony_metric_pb2 import \
TelephonyVoiceTestResult
-from acts_contrib.test_utils.tel.loggers.telephony_metric_logger import \
+from acts.test_utils.tel.loggers.telephony_metric_logger import \
TelephonyMetricLogger
-from acts_contrib.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
-from acts_contrib.test_utils.tel.tel_defines import CALL_CAPABILITY_MANAGE_CONFERENCE
-from acts_contrib.test_utils.tel.tel_defines import CALL_PROPERTY_CONFERENCE
-from acts_contrib.test_utils.tel.tel_defines import CALL_STATE_ACTIVE
-from acts_contrib.test_utils.tel.tel_defines import CAPABILITY_CONFERENCE
-from acts_contrib.test_utils.tel.tel_defines import WAIT_TIME_IN_CALL
-from acts_contrib.test_utils.tel.tel_defines import INVALID_SUB_ID
-from acts_contrib.test_utils.tel.tel_defines import WFC_MODE_CELLULAR_PREFERRED
-from acts_contrib.test_utils.tel.tel_defines import WFC_MODE_WIFI_PREFERRED
-from acts_contrib.test_utils.tel.tel_subscription_utils import \
+from acts.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
+from acts.test_utils.tel.tel_defines import CALL_CAPABILITY_MANAGE_CONFERENCE
+from acts.test_utils.tel.tel_defines import CALL_PROPERTY_CONFERENCE
+from acts.test_utils.tel.tel_defines import CALL_STATE_ACTIVE
+from acts.test_utils.tel.tel_defines import CAPABILITY_CONFERENCE
+from acts.test_utils.tel.tel_defines import WAIT_TIME_IN_CALL
+from acts.test_utils.tel.tel_defines import INVALID_SUB_ID
+from acts.test_utils.tel.tel_defines import WFC_MODE_CELLULAR_PREFERRED
+from acts.test_utils.tel.tel_defines import WFC_MODE_WIFI_PREFERRED
+from acts.test_utils.tel.tel_subscription_utils import \
get_incoming_voice_sub_id
-from acts_contrib.test_utils.tel.tel_subscription_utils import \
+from acts.test_utils.tel.tel_subscription_utils import \
get_outgoing_voice_sub_id
-from acts_contrib.test_utils.tel.tel_subscription_utils import get_subid_from_slot_index
-from acts_contrib.test_utils.tel.tel_subscription_utils import set_voice_sub_id
-from acts_contrib.test_utils.tel.tel_subscription_utils import set_dds_on_slot_0
-from acts_contrib.test_utils.tel.tel_subscription_utils import set_dds_on_slot_1
-from acts_contrib.test_utils.tel.tel_subscription_utils import \
+from acts.test_utils.tel.tel_subscription_utils import get_subid_from_slot_index
+from acts.test_utils.tel.tel_subscription_utils import set_voice_sub_id
+from acts.test_utils.tel.tel_subscription_utils import set_dds_on_slot_0
+from acts.test_utils.tel.tel_subscription_utils import set_dds_on_slot_1
+from acts.test_utils.tel.tel_subscription_utils import \
get_subid_on_same_network_of_host_ad
-from acts_contrib.test_utils.tel.tel_test_utils import call_setup_teardown
-from acts_contrib.test_utils.tel.tel_test_utils import hangup_call
-from acts_contrib.test_utils.tel.tel_test_utils import ensure_wifi_connected
-from acts_contrib.test_utils.tel.tel_test_utils import multithread_func
-from acts_contrib.test_utils.tel.tel_test_utils import num_active_calls
-from acts_contrib.test_utils.tel.tel_test_utils import verify_incall_state
-from acts_contrib.test_utils.tel.tel_test_utils import toggle_volte_for_subscription
-from acts_contrib.test_utils.tel.tel_test_utils import toggle_wfc_for_subscription
-from acts_contrib.test_utils.tel.tel_test_utils import set_wfc_mode_for_subscription
-from acts_contrib.test_utils.tel.tel_test_utils import get_capability_for_subscription
-from acts_contrib.test_utils.tel.tel_test_utils import verify_http_connection
-from acts_contrib.test_utils.tel.tel_test_utils import ensure_phones_idle
-from acts_contrib.test_utils.tel.tel_test_utils import set_call_forwarding_by_mmi
-from acts_contrib.test_utils.tel.tel_test_utils import erase_call_forwarding_by_mmi
-from acts_contrib.test_utils.tel.tel_test_utils import toggle_airplane_mode
-from acts_contrib.test_utils.tel.tel_test_utils import set_call_waiting
-from acts_contrib.test_utils.tel.tel_test_utils import initiate_call
-from acts_contrib.test_utils.tel.tel_test_utils import \
+from acts.test_utils.tel.tel_test_utils import call_setup_teardown
+from acts.test_utils.tel.tel_test_utils import hangup_call
+from acts.test_utils.tel.tel_test_utils import ensure_wifi_connected
+from acts.test_utils.tel.tel_test_utils import multithread_func
+from acts.test_utils.tel.tel_test_utils import num_active_calls
+from acts.test_utils.tel.tel_test_utils import verify_incall_state
+from acts.test_utils.tel.tel_test_utils import toggle_volte_for_subscription
+from acts.test_utils.tel.tel_test_utils import toggle_wfc_for_subscription
+from acts.test_utils.tel.tel_test_utils import set_wfc_mode_for_subscription
+from acts.test_utils.tel.tel_test_utils import get_capability_for_subscription
+from acts.test_utils.tel.tel_test_utils import verify_http_connection
+from acts.test_utils.tel.tel_test_utils import ensure_phones_idle
+from acts.test_utils.tel.tel_test_utils import set_call_forwarding_by_mmi
+from acts.test_utils.tel.tel_test_utils import erase_call_forwarding_by_mmi
+from acts.test_utils.tel.tel_test_utils import toggle_airplane_mode
+from acts.test_utils.tel.tel_test_utils import set_call_waiting
+from acts.test_utils.tel.tel_test_utils import initiate_call
+from acts.test_utils.tel.tel_test_utils import \
wait_and_reject_call_for_subscription
-from acts_contrib.test_utils.tel.tel_test_utils import get_operator_name
-from acts_contrib.test_utils.tel.tel_voice_utils import get_cep_conference_call_id
-from acts_contrib.test_utils.tel.tel_voice_utils import is_phone_in_call_3g
-from acts_contrib.test_utils.tel.tel_voice_utils import is_phone_in_call_csfb
-from acts_contrib.test_utils.tel.tel_voice_utils import is_phone_in_call_volte
-from acts_contrib.test_utils.tel.tel_voice_utils import is_phone_in_call_iwlan
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_iwlan_for_subscription
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_csfb
-from acts_contrib.test_utils.tel.tel_voice_utils import \
+from acts.test_utils.tel.tel_test_utils import get_operator_name
+from acts.test_utils.tel.tel_voice_utils import get_cep_conference_call_id
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_3g
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_csfb
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_volte
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_iwlan
+from acts.test_utils.tel.tel_voice_utils import phone_setup_iwlan_for_subscription
+from acts.test_utils.tel.tel_voice_utils import phone_setup_csfb
+from acts.test_utils.tel.tel_voice_utils import \
phone_setup_csfb_for_subscription
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_voice_3g
-from acts_contrib.test_utils.tel.tel_voice_utils import \
+from acts.test_utils.tel.tel_voice_utils import phone_setup_voice_3g
+from acts.test_utils.tel.tel_voice_utils import \
phone_setup_voice_3g_for_subscription
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_voice_general
-from acts_contrib.test_utils.tel.tel_voice_utils import \
+from acts.test_utils.tel.tel_voice_utils import phone_setup_voice_general
+from acts.test_utils.tel.tel_voice_utils import \
phone_setup_voice_general_for_subscription
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_volte
-from acts_contrib.test_utils.tel.tel_voice_utils import \
+from acts.test_utils.tel.tel_voice_utils import phone_setup_volte
+from acts.test_utils.tel.tel_voice_utils import \
phone_setup_volte_for_subscription
-from acts_contrib.test_utils.tel.tel_voice_utils import \
+from acts.test_utils.tel.tel_voice_utils import \
three_phone_call_forwarding_short_seq
-from acts_contrib.test_utils.tel.tel_voice_utils import \
+from acts.test_utils.tel.tel_voice_utils import \
three_phone_call_waiting_short_seq
-from acts_contrib.test_utils.tel.tel_voice_utils import swap_calls
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_on_rat
-from acts_contrib.test_utils.tel.tel_voice_utils import is_phone_in_call_on_rat
+from acts.test_utils.tel.tel_voice_utils import swap_calls
+from acts.test_utils.tel.tel_voice_utils import phone_setup_on_rat
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_on_rat
CallResult = TelephonyVoiceTestResult.CallResult.Value
diff --git a/acts_tests/tests/google/tel/live/TelLiveImsSettingsTest.py b/acts_tests/tests/google/tel/live/TelLiveImsSettingsTest.py
index 2e9c918..4454be6 100644
--- a/acts_tests/tests/google/tel/live/TelLiveImsSettingsTest.py
+++ b/acts_tests/tests/google/tel/live/TelLiveImsSettingsTest.py
@@ -21,57 +21,57 @@
from acts import signals
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
-from acts_contrib.test_utils.tel.tel_defines import CarrierConfigs
-from acts_contrib.test_utils.tel.tel_defines import CAPABILITY_VOLTE
-from acts_contrib.test_utils.tel.tel_defines import CAPABILITY_WFC
-from acts_contrib.test_utils.tel.tel_defines import CAPABILITY_WFC_MODE_CHANGE
-from acts_contrib.test_utils.tel.tel_defines import GEN_4G
-from acts_contrib.test_utils.tel.tel_defines import MAX_WAIT_TIME_WIFI_CONNECTION
-from acts_contrib.test_utils.tel.tel_defines import NETWORK_SERVICE_DATA
-from acts_contrib.test_utils.tel.tel_defines import NETWORK_SERVICE_VOICE
-from acts_contrib.test_utils.tel.tel_defines import MAX_WAIT_TIME_IMS_REGISTRATION
-from acts_contrib.test_utils.tel.tel_defines import MAX_WAIT_TIME_WFC_ENABLED
-from acts_contrib.test_utils.tel.tel_defines import RAT_FAMILY_WLAN
-from acts_contrib.test_utils.tel.tel_defines import RAT_LTE
-from acts_contrib.test_utils.tel.tel_defines import RAT_UNKNOWN
-from acts_contrib.test_utils.tel.tel_defines import WFC_MODE_CELLULAR_PREFERRED
-from acts_contrib.test_utils.tel.tel_defines import WFC_MODE_DISABLED
-from acts_contrib.test_utils.tel.tel_defines import WFC_MODE_WIFI_ONLY
-from acts_contrib.test_utils.tel.tel_defines import WFC_MODE_WIFI_PREFERRED
-from acts_contrib.test_utils.tel.tel_subscription_utils import get_outgoing_voice_sub_id
-from acts_contrib.test_utils.tel.tel_test_utils import call_setup_teardown
-from acts_contrib.test_utils.tel.tel_test_utils import dumpsys_carrier_config
-from acts_contrib.test_utils.tel.tel_test_utils import ensure_phone_subscription
-from acts_contrib.test_utils.tel.tel_test_utils import ensure_wifi_connected
-from acts_contrib.test_utils.tel.tel_test_utils import fastboot_wipe
-from acts_contrib.test_utils.tel.tel_test_utils import get_user_config_profile
-from acts_contrib.test_utils.tel.tel_test_utils import is_droid_in_rat_family
-from acts_contrib.test_utils.tel.tel_test_utils import revert_default_telephony_setting
-from acts_contrib.test_utils.tel.tel_test_utils import set_wfc_mode
-from acts_contrib.test_utils.tel.tel_test_utils import toggle_airplane_mode_by_adb
-from acts_contrib.test_utils.tel.tel_test_utils import toggle_volte
-from acts_contrib.test_utils.tel.tel_test_utils import toggle_wfc
-from acts_contrib.test_utils.tel.tel_test_utils import verify_default_telephony_setting
-from acts_contrib.test_utils.tel.tel_test_utils import verify_internet_connection
-from acts_contrib.test_utils.tel.tel_test_utils import wait_for_ims_registered
-from acts_contrib.test_utils.tel.tel_test_utils import wait_for_network_rat
-from acts_contrib.test_utils.tel.tel_test_utils import wait_for_not_network_rat
-from acts_contrib.test_utils.tel.tel_test_utils import wait_for_state
-from acts_contrib.test_utils.tel.tel_test_utils import wait_for_voice_attach
-from acts_contrib.test_utils.tel.tel_test_utils import wait_for_volte_enabled
-from acts_contrib.test_utils.tel.tel_test_utils import wait_for_wfc_disabled
-from acts_contrib.test_utils.tel.tel_test_utils import wait_for_wfc_enabled
-from acts_contrib.test_utils.tel.tel_test_utils import wait_for_wifi_data_connection
-from acts_contrib.test_utils.tel.tel_test_utils import wifi_reset
-from acts_contrib.test_utils.tel.tel_test_utils import wifi_toggle_state
-from acts_contrib.test_utils.tel.tel_voice_utils import is_phone_in_call_iwlan
-from acts_contrib.test_utils.tel.tel_voice_utils import is_phone_in_call_volte
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_voice_3g
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_csfb
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_volte
-from acts_contrib.test_utils.tel.tel_test_utils import WIFI_SSID_KEY
-from acts_contrib.test_utils.tel.tel_test_utils import WIFI_PWD_KEY
+from acts.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
+from acts.test_utils.tel.tel_defines import CarrierConfigs
+from acts.test_utils.tel.tel_defines import CAPABILITY_VOLTE
+from acts.test_utils.tel.tel_defines import CAPABILITY_WFC
+from acts.test_utils.tel.tel_defines import CAPABILITY_WFC_MODE_CHANGE
+from acts.test_utils.tel.tel_defines import GEN_4G
+from acts.test_utils.tel.tel_defines import MAX_WAIT_TIME_WIFI_CONNECTION
+from acts.test_utils.tel.tel_defines import NETWORK_SERVICE_DATA
+from acts.test_utils.tel.tel_defines import NETWORK_SERVICE_VOICE
+from acts.test_utils.tel.tel_defines import MAX_WAIT_TIME_IMS_REGISTRATION
+from acts.test_utils.tel.tel_defines import MAX_WAIT_TIME_WFC_ENABLED
+from acts.test_utils.tel.tel_defines import RAT_FAMILY_WLAN
+from acts.test_utils.tel.tel_defines import RAT_LTE
+from acts.test_utils.tel.tel_defines import RAT_UNKNOWN
+from acts.test_utils.tel.tel_defines import WFC_MODE_CELLULAR_PREFERRED
+from acts.test_utils.tel.tel_defines import WFC_MODE_DISABLED
+from acts.test_utils.tel.tel_defines import WFC_MODE_WIFI_ONLY
+from acts.test_utils.tel.tel_defines import WFC_MODE_WIFI_PREFERRED
+from acts.test_utils.tel.tel_subscription_utils import get_outgoing_voice_sub_id
+from acts.test_utils.tel.tel_test_utils import call_setup_teardown
+from acts.test_utils.tel.tel_test_utils import dumpsys_carrier_config
+from acts.test_utils.tel.tel_test_utils import ensure_phone_subscription
+from acts.test_utils.tel.tel_test_utils import ensure_wifi_connected
+from acts.test_utils.tel.tel_test_utils import fastboot_wipe
+from acts.test_utils.tel.tel_test_utils import get_user_config_profile
+from acts.test_utils.tel.tel_test_utils import is_droid_in_rat_family
+from acts.test_utils.tel.tel_test_utils import revert_default_telephony_setting
+from acts.test_utils.tel.tel_test_utils import set_wfc_mode
+from acts.test_utils.tel.tel_test_utils import toggle_airplane_mode_by_adb
+from acts.test_utils.tel.tel_test_utils import toggle_volte
+from acts.test_utils.tel.tel_test_utils import toggle_wfc
+from acts.test_utils.tel.tel_test_utils import verify_default_telephony_setting
+from acts.test_utils.tel.tel_test_utils import verify_internet_connection
+from acts.test_utils.tel.tel_test_utils import wait_for_ims_registered
+from acts.test_utils.tel.tel_test_utils import wait_for_network_rat
+from acts.test_utils.tel.tel_test_utils import wait_for_not_network_rat
+from acts.test_utils.tel.tel_test_utils import wait_for_state
+from acts.test_utils.tel.tel_test_utils import wait_for_voice_attach
+from acts.test_utils.tel.tel_test_utils import wait_for_volte_enabled
+from acts.test_utils.tel.tel_test_utils import wait_for_wfc_disabled
+from acts.test_utils.tel.tel_test_utils import wait_for_wfc_enabled
+from acts.test_utils.tel.tel_test_utils import wait_for_wifi_data_connection
+from acts.test_utils.tel.tel_test_utils import wifi_reset
+from acts.test_utils.tel.tel_test_utils import wifi_toggle_state
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_iwlan
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_volte
+from acts.test_utils.tel.tel_voice_utils import phone_setup_voice_3g
+from acts.test_utils.tel.tel_voice_utils import phone_setup_csfb
+from acts.test_utils.tel.tel_voice_utils import phone_setup_volte
+from acts.test_utils.tel.tel_test_utils import WIFI_SSID_KEY
+from acts.test_utils.tel.tel_test_utils import WIFI_PWD_KEY
class TelLiveImsSettingsTest(TelephonyBaseTest):
diff --git a/acts_tests/tests/google/tel/live/TelLiveLockedSimTest.py b/acts_tests/tests/google/tel/live/TelLiveLockedSimTest.py
index 83c192a..55c989c 100644
--- a/acts_tests/tests/google/tel/live/TelLiveLockedSimTest.py
+++ b/acts_tests/tests/google/tel/live/TelLiveLockedSimTest.py
@@ -19,25 +19,25 @@
from acts import signals
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
-from acts_contrib.test_utils.tel.tel_defines import CAPABILITY_WFC
-from acts_contrib.test_utils.tel.tel_defines import DEFAULT_DEVICE_PASSWORD
-from acts_contrib.test_utils.tel.tel_defines import GEN_2G
-from acts_contrib.test_utils.tel.tel_defines import GEN_3G
-from acts_contrib.test_utils.tel.tel_defines import GEN_4G
-from acts_contrib.test_utils.tel.tel_defines import WFC_MODE_WIFI_PREFERRED
-from acts_contrib.test_utils.tel.tel_lookup_tables import \
+from acts.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
+from acts.test_utils.tel.tel_defines import CAPABILITY_WFC
+from acts.test_utils.tel.tel_defines import DEFAULT_DEVICE_PASSWORD
+from acts.test_utils.tel.tel_defines import GEN_2G
+from acts.test_utils.tel.tel_defines import GEN_3G
+from acts.test_utils.tel.tel_defines import GEN_4G
+from acts.test_utils.tel.tel_defines import WFC_MODE_WIFI_PREFERRED
+from acts.test_utils.tel.tel_lookup_tables import \
network_preference_for_generation
-from acts_contrib.test_utils.tel.tel_lookup_tables import operator_capabilities
-from acts_contrib.test_utils.tel.tel_test_utils import fastboot_wipe
-from acts_contrib.test_utils.tel.tel_test_utils import get_sim_state
-from acts_contrib.test_utils.tel.tel_test_utils import is_sim_lock_enabled
-from acts_contrib.test_utils.tel.tel_test_utils import is_sim_locked
-from acts_contrib.test_utils.tel.tel_test_utils import reboot_device
-from acts_contrib.test_utils.tel.tel_test_utils import reset_device_password
-from acts_contrib.test_utils.tel.tel_test_utils import toggle_airplane_mode_by_adb
-from acts_contrib.test_utils.tel.tel_test_utils import unlock_sim
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_iwlan
+from acts.test_utils.tel.tel_lookup_tables import operator_capabilities
+from acts.test_utils.tel.tel_test_utils import fastboot_wipe
+from acts.test_utils.tel.tel_test_utils import get_sim_state
+from acts.test_utils.tel.tel_test_utils import is_sim_lock_enabled
+from acts.test_utils.tel.tel_test_utils import is_sim_locked
+from acts.test_utils.tel.tel_test_utils import reboot_device
+from acts.test_utils.tel.tel_test_utils import reset_device_password
+from acts.test_utils.tel.tel_test_utils import toggle_airplane_mode_by_adb
+from acts.test_utils.tel.tel_test_utils import unlock_sim
+from acts.test_utils.tel.tel_voice_utils import phone_setup_iwlan
from TelLiveEmergencyBase import TelLiveEmergencyBase
EXPECTED_CALL_TEST_RESULT = False
diff --git a/acts_tests/tests/google/tel/live/TelLiveMobilityStressTest.py b/acts_tests/tests/google/tel/live/TelLiveMobilityStressTest.py
index 0319763..2120c04 100644
--- a/acts_tests/tests/google/tel/live/TelLiveMobilityStressTest.py
+++ b/acts_tests/tests/google/tel/live/TelLiveMobilityStressTest.py
@@ -23,41 +23,41 @@
from acts.asserts import explicit_pass
from acts.asserts import fail
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
-from acts_contrib.test_utils.tel.tel_atten_utils import set_rssi
-from acts_contrib.test_utils.tel.tel_defines import CELL_WEAK_RSSI_VALUE
-from acts_contrib.test_utils.tel.tel_defines import CELL_STRONG_RSSI_VALUE
-from acts_contrib.test_utils.tel.tel_defines import MAX_RSSI_RESERVED_VALUE
-from acts_contrib.test_utils.tel.tel_defines import MIN_RSSI_RESERVED_VALUE
-from acts_contrib.test_utils.tel.tel_defines import WFC_MODE_CELLULAR_PREFERRED
-from acts_contrib.test_utils.tel.tel_defines import WFC_MODE_DISABLED
-from acts_contrib.test_utils.tel.tel_defines import WFC_MODE_WIFI_PREFERRED
-from acts_contrib.test_utils.tel.tel_defines import WFC_MODE_CELLULAR_PREFERRED
-from acts_contrib.test_utils.tel.tel_defines import WIFI_WEAK_RSSI_VALUE
-from acts_contrib.test_utils.tel.tel_test_utils import active_file_download_test
-from acts_contrib.test_utils.tel.tel_test_utils import call_setup_teardown
-from acts_contrib.test_utils.tel.tel_test_utils import ensure_phone_default_state
-from acts_contrib.test_utils.tel.tel_test_utils import ensure_phone_subscription
-from acts_contrib.test_utils.tel.tel_test_utils import ensure_phones_idle
-from acts_contrib.test_utils.tel.tel_test_utils import ensure_wifi_connected
-from acts_contrib.test_utils.tel.tel_test_utils import hangup_call
-from acts_contrib.test_utils.tel.tel_test_utils import is_voice_attached
-from acts_contrib.test_utils.tel.tel_test_utils import run_multithread_func
-from acts_contrib.test_utils.tel.tel_test_utils import set_wfc_mode
-from acts_contrib.test_utils.tel.tel_test_utils import sms_send_receive_verify
-from acts_contrib.test_utils.tel.tel_test_utils import start_qxdm_loggers
-from acts_contrib.test_utils.tel.tel_test_utils import mms_send_receive_verify
-from acts_contrib.test_utils.tel.tel_voice_utils import is_phone_in_call_3g
-from acts_contrib.test_utils.tel.tel_voice_utils import is_phone_in_call_2g
-from acts_contrib.test_utils.tel.tel_voice_utils import is_phone_in_call_csfb
-from acts_contrib.test_utils.tel.tel_voice_utils import is_phone_in_call_iwlan
-from acts_contrib.test_utils.tel.tel_voice_utils import is_phone_in_call_volte
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_csfb
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_iwlan
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_voice_3g
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_voice_2g
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_volte
-from acts_contrib.test_utils.tel.tel_voice_utils import get_current_voice_rat
+from acts.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
+from acts.test_utils.tel.tel_atten_utils import set_rssi
+from acts.test_utils.tel.tel_defines import CELL_WEAK_RSSI_VALUE
+from acts.test_utils.tel.tel_defines import CELL_STRONG_RSSI_VALUE
+from acts.test_utils.tel.tel_defines import MAX_RSSI_RESERVED_VALUE
+from acts.test_utils.tel.tel_defines import MIN_RSSI_RESERVED_VALUE
+from acts.test_utils.tel.tel_defines import WFC_MODE_CELLULAR_PREFERRED
+from acts.test_utils.tel.tel_defines import WFC_MODE_DISABLED
+from acts.test_utils.tel.tel_defines import WFC_MODE_WIFI_PREFERRED
+from acts.test_utils.tel.tel_defines import WFC_MODE_CELLULAR_PREFERRED
+from acts.test_utils.tel.tel_defines import WIFI_WEAK_RSSI_VALUE
+from acts.test_utils.tel.tel_test_utils import active_file_download_test
+from acts.test_utils.tel.tel_test_utils import call_setup_teardown
+from acts.test_utils.tel.tel_test_utils import ensure_phone_default_state
+from acts.test_utils.tel.tel_test_utils import ensure_phone_subscription
+from acts.test_utils.tel.tel_test_utils import ensure_phones_idle
+from acts.test_utils.tel.tel_test_utils import ensure_wifi_connected
+from acts.test_utils.tel.tel_test_utils import hangup_call
+from acts.test_utils.tel.tel_test_utils import is_voice_attached
+from acts.test_utils.tel.tel_test_utils import run_multithread_func
+from acts.test_utils.tel.tel_test_utils import set_wfc_mode
+from acts.test_utils.tel.tel_test_utils import sms_send_receive_verify
+from acts.test_utils.tel.tel_test_utils import start_qxdm_loggers
+from acts.test_utils.tel.tel_test_utils import mms_send_receive_verify
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_3g
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_2g
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_csfb
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_iwlan
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_volte
+from acts.test_utils.tel.tel_voice_utils import phone_setup_csfb
+from acts.test_utils.tel.tel_voice_utils import phone_setup_iwlan
+from acts.test_utils.tel.tel_voice_utils import phone_setup_voice_3g
+from acts.test_utils.tel.tel_voice_utils import phone_setup_voice_2g
+from acts.test_utils.tel.tel_voice_utils import phone_setup_volte
+from acts.test_utils.tel.tel_voice_utils import get_current_voice_rat
from acts.logger import epoch_to_log_line_timestamp
from acts.utils import get_current_epoch_time
diff --git a/acts_tests/tests/google/tel/live/TelLiveNoQXDMLogTest.py b/acts_tests/tests/google/tel/live/TelLiveNoQXDMLogTest.py
index 2ada2a8..c50403c 100644
--- a/acts_tests/tests/google/tel/live/TelLiveNoQXDMLogTest.py
+++ b/acts_tests/tests/google/tel/live/TelLiveNoQXDMLogTest.py
@@ -29,44 +29,44 @@
from acts.controllers.android_device import list_adb_devices
from acts.controllers.android_device import list_fastboot_devices
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
-from acts_contrib.test_utils.tel.tel_defines import WAIT_TIME_FOR_BOOT_COMPLETE
-from acts_contrib.test_utils.tel.tel_defines import WAIT_TIME_FOR_CARRIERCONFIG_CHANGE
-from acts_contrib.test_utils.tel.tel_defines import WAIT_TIME_FOR_CARRIERID_CHANGE
-from acts_contrib.test_utils.tel.tel_defines import VZW_CARRIER_CONFIG_VERSION
-from acts_contrib.test_utils.tel.tel_defines import ATT_CARRIER_CONFIG_VERSION
-from acts_contrib.test_utils.tel.tel_defines import CARRIER_ID_METADATA_URL
-from acts_contrib.test_utils.tel.tel_defines import CARRIER_ID_CONTENT_URL
-from acts_contrib.test_utils.tel.tel_defines import CARRIER_ID_VERSION
-from acts_contrib.test_utils.tel.tel_defines import ER_DB_ID_VERSION
-from acts_contrib.test_utils.tel.tel_defines import WAIT_TIME_FOR_ER_DB_CHANGE
-from acts_contrib.test_utils.tel.tel_defines import CARRIER_ID_METADATA_URL_P
-from acts_contrib.test_utils.tel.tel_defines import CARRIER_ID_CONTENT_URL_P
-from acts_contrib.test_utils.tel.tel_defines import CARRIER_ID_VERSION_P
-from acts_contrib.test_utils.tel.tel_lookup_tables import device_capabilities
-from acts_contrib.test_utils.tel.tel_lookup_tables import operator_capabilities
-from acts_contrib.test_utils.tel.tel_test_utils import lock_lte_band_by_mds
-from acts_contrib.test_utils.tel.tel_test_utils import get_model_name
-from acts_contrib.test_utils.tel.tel_test_utils import get_operator_name
-from acts_contrib.test_utils.tel.tel_test_utils import reboot_device
-from acts_contrib.test_utils.tel.tel_test_utils import toggle_airplane_mode
-from acts_contrib.test_utils.tel.tel_test_utils import trigger_modem_crash_by_modem
-from acts_contrib.test_utils.tel.tel_test_utils import bring_up_sl4a
-from acts_contrib.test_utils.tel.tel_test_utils import fastboot_wipe
-from acts_contrib.test_utils.tel.tel_test_utils import get_carrier_config_version
-from acts_contrib.test_utils.tel.tel_test_utils import get_carrier_id_version
-from acts_contrib.test_utils.tel.tel_test_utils import get_er_db_id_version
-from acts_contrib.test_utils.tel.tel_test_utils import get_database_content
-from acts_contrib.test_utils.tel.tel_test_utils import install_googleaccountutil_apk
-from acts_contrib.test_utils.tel.tel_test_utils import add_whitelisted_account
-from acts_contrib.test_utils.tel.tel_test_utils import adb_disable_verity
-from acts_contrib.test_utils.tel.tel_test_utils import install_carriersettings_apk
-from acts_contrib.test_utils.tel.tel_test_utils import ensure_wifi_connected
-from acts_contrib.test_utils.tel.tel_test_utils import cleanup_configupdater
-from acts_contrib.test_utils.tel.tel_test_utils import pull_carrier_id_files
-from acts_contrib.test_utils.tel.tel_test_utils import wifi_toggle_state
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_volte
-from acts_contrib.test_utils.tel.tel_subscription_utils import get_cbrs_and_default_sub_id
+from acts.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
+from acts.test_utils.tel.tel_defines import WAIT_TIME_FOR_BOOT_COMPLETE
+from acts.test_utils.tel.tel_defines import WAIT_TIME_FOR_CARRIERCONFIG_CHANGE
+from acts.test_utils.tel.tel_defines import WAIT_TIME_FOR_CARRIERID_CHANGE
+from acts.test_utils.tel.tel_defines import VZW_CARRIER_CONFIG_VERSION
+from acts.test_utils.tel.tel_defines import ATT_CARRIER_CONFIG_VERSION
+from acts.test_utils.tel.tel_defines import CARRIER_ID_METADATA_URL
+from acts.test_utils.tel.tel_defines import CARRIER_ID_CONTENT_URL
+from acts.test_utils.tel.tel_defines import CARRIER_ID_VERSION
+from acts.test_utils.tel.tel_defines import ER_DB_ID_VERSION
+from acts.test_utils.tel.tel_defines import WAIT_TIME_FOR_ER_DB_CHANGE
+from acts.test_utils.tel.tel_defines import CARRIER_ID_METADATA_URL_P
+from acts.test_utils.tel.tel_defines import CARRIER_ID_CONTENT_URL_P
+from acts.test_utils.tel.tel_defines import CARRIER_ID_VERSION_P
+from acts.test_utils.tel.tel_lookup_tables import device_capabilities
+from acts.test_utils.tel.tel_lookup_tables import operator_capabilities
+from acts.test_utils.tel.tel_test_utils import lock_lte_band_by_mds
+from acts.test_utils.tel.tel_test_utils import get_model_name
+from acts.test_utils.tel.tel_test_utils import get_operator_name
+from acts.test_utils.tel.tel_test_utils import reboot_device
+from acts.test_utils.tel.tel_test_utils import toggle_airplane_mode
+from acts.test_utils.tel.tel_test_utils import trigger_modem_crash_by_modem
+from acts.test_utils.tel.tel_test_utils import bring_up_sl4a
+from acts.test_utils.tel.tel_test_utils import fastboot_wipe
+from acts.test_utils.tel.tel_test_utils import get_carrier_config_version
+from acts.test_utils.tel.tel_test_utils import get_carrier_id_version
+from acts.test_utils.tel.tel_test_utils import get_er_db_id_version
+from acts.test_utils.tel.tel_test_utils import get_database_content
+from acts.test_utils.tel.tel_test_utils import install_googleaccountutil_apk
+from acts.test_utils.tel.tel_test_utils import add_whitelisted_account
+from acts.test_utils.tel.tel_test_utils import adb_disable_verity
+from acts.test_utils.tel.tel_test_utils import install_carriersettings_apk
+from acts.test_utils.tel.tel_test_utils import ensure_wifi_connected
+from acts.test_utils.tel.tel_test_utils import cleanup_configupdater
+from acts.test_utils.tel.tel_test_utils import pull_carrier_id_files
+from acts.test_utils.tel.tel_test_utils import wifi_toggle_state
+from acts.test_utils.tel.tel_voice_utils import phone_setup_volte
+from acts.test_utils.tel.tel_subscription_utils import get_cbrs_and_default_sub_id
from acts.utils import get_current_epoch_time
from acts.keys import Config
diff --git a/acts_tests/tests/google/tel/live/TelLiveNoSimTest.py b/acts_tests/tests/google/tel/live/TelLiveNoSimTest.py
index 9e4cc07..c8b2b7f 100644
--- a/acts_tests/tests/google/tel/live/TelLiveNoSimTest.py
+++ b/acts_tests/tests/google/tel/live/TelLiveNoSimTest.py
@@ -19,19 +19,19 @@
from acts import signals
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
-from acts_contrib.test_utils.tel.tel_defines import DEFAULT_DEVICE_PASSWORD
-from acts_contrib.test_utils.tel.tel_defines import GEN_2G
-from acts_contrib.test_utils.tel.tel_defines import GEN_3G
-from acts_contrib.test_utils.tel.tel_defines import GEN_4G
-from acts_contrib.test_utils.tel.tel_defines import SIM_STATE_ABSENT
-from acts_contrib.test_utils.tel.tel_defines import SIM_STATE_UNKNOWN
-from acts_contrib.test_utils.tel.tel_test_utils import fastboot_wipe
-from acts_contrib.test_utils.tel.tel_test_utils import get_sim_state
-from acts_contrib.test_utils.tel.tel_lookup_tables import \
+from acts.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
+from acts.test_utils.tel.tel_defines import DEFAULT_DEVICE_PASSWORD
+from acts.test_utils.tel.tel_defines import GEN_2G
+from acts.test_utils.tel.tel_defines import GEN_3G
+from acts.test_utils.tel.tel_defines import GEN_4G
+from acts.test_utils.tel.tel_defines import SIM_STATE_ABSENT
+from acts.test_utils.tel.tel_defines import SIM_STATE_UNKNOWN
+from acts.test_utils.tel.tel_test_utils import fastboot_wipe
+from acts.test_utils.tel.tel_test_utils import get_sim_state
+from acts.test_utils.tel.tel_lookup_tables import \
network_preference_for_generation
-from acts_contrib.test_utils.tel.tel_test_utils import reset_device_password
-from acts_contrib.test_utils.tel.tel_test_utils import toggle_airplane_mode_by_adb
+from acts.test_utils.tel.tel_test_utils import reset_device_password
+from acts.test_utils.tel.tel_test_utils import toggle_airplane_mode_by_adb
from TelLiveEmergencyBase import TelLiveEmergencyBase
diff --git a/acts_tests/tests/google/tel/live/TelLivePostflightTest.py b/acts_tests/tests/google/tel/live/TelLivePostflightTest.py
index 6c7b33b..4ccbc8a 100644
--- a/acts_tests/tests/google/tel/live/TelLivePostflightTest.py
+++ b/acts_tests/tests/google/tel/live/TelLivePostflightTest.py
@@ -20,7 +20,7 @@
from acts.asserts import fail
from acts.base_test import BaseTestClass
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
+from acts.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
class TelLivePostflightTest(TelephonyBaseTest):
diff --git a/acts_tests/tests/google/tel/live/TelLivePreflightTest.py b/acts_tests/tests/google/tel/live/TelLivePreflightTest.py
index 134255e..18da880 100644
--- a/acts_tests/tests/google/tel/live/TelLivePreflightTest.py
+++ b/acts_tests/tests/google/tel/live/TelLivePreflightTest.py
@@ -23,29 +23,29 @@
from acts.controllers.android_device import get_info
from acts.libs.ota import ota_updater
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
-from acts_contrib.test_utils.tel.tel_defines import NETWORK_SERVICE_DATA
-from acts_contrib.test_utils.tel.tel_defines import RAT_FAMILY_WLAN
-from acts_contrib.test_utils.tel.tel_defines import WFC_MODE_CELLULAR_PREFERRED
-from acts_contrib.test_utils.tel.tel_defines import WFC_MODE_WIFI_PREFERRED
-from acts_contrib.test_utils.tel.tel_test_utils import abort_all_tests
-from acts_contrib.test_utils.tel.tel_test_utils import call_setup_teardown
-from acts_contrib.test_utils.tel.tel_test_utils import ensure_phones_default_state
-from acts_contrib.test_utils.tel.tel_test_utils import ensure_phone_subscription
-from acts_contrib.test_utils.tel.tel_test_utils import ensure_wifi_connected
-from acts_contrib.test_utils.tel.tel_test_utils import get_user_config_profile
-from acts_contrib.test_utils.tel.tel_test_utils import is_sim_locked
-from acts_contrib.test_utils.tel.tel_test_utils import multithread_func
-from acts_contrib.test_utils.tel.tel_test_utils import unlock_sim
-from acts_contrib.test_utils.tel.tel_test_utils import verify_internet_connection
-from acts_contrib.test_utils.tel.tel_test_utils import wait_for_network_rat
-from acts_contrib.test_utils.tel.tel_test_utils import wait_for_wfc_enabled
-from acts_contrib.test_utils.tel.tel_test_utils import wait_for_wifi_data_connection
-from acts_contrib.test_utils.tel.tel_test_utils import wifi_toggle_state
-from acts_contrib.test_utils.tel.tel_voice_utils import is_phone_in_call_iwlan
-from acts_contrib.test_utils.tel.tel_voice_utils import is_phone_in_call_volte
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_iwlan
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_iwlan_cellular_preferred
+from acts.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
+from acts.test_utils.tel.tel_defines import NETWORK_SERVICE_DATA
+from acts.test_utils.tel.tel_defines import RAT_FAMILY_WLAN
+from acts.test_utils.tel.tel_defines import WFC_MODE_CELLULAR_PREFERRED
+from acts.test_utils.tel.tel_defines import WFC_MODE_WIFI_PREFERRED
+from acts.test_utils.tel.tel_test_utils import abort_all_tests
+from acts.test_utils.tel.tel_test_utils import call_setup_teardown
+from acts.test_utils.tel.tel_test_utils import ensure_phones_default_state
+from acts.test_utils.tel.tel_test_utils import ensure_phone_subscription
+from acts.test_utils.tel.tel_test_utils import ensure_wifi_connected
+from acts.test_utils.tel.tel_test_utils import get_user_config_profile
+from acts.test_utils.tel.tel_test_utils import is_sim_locked
+from acts.test_utils.tel.tel_test_utils import multithread_func
+from acts.test_utils.tel.tel_test_utils import unlock_sim
+from acts.test_utils.tel.tel_test_utils import verify_internet_connection
+from acts.test_utils.tel.tel_test_utils import wait_for_network_rat
+from acts.test_utils.tel.tel_test_utils import wait_for_wfc_enabled
+from acts.test_utils.tel.tel_test_utils import wait_for_wifi_data_connection
+from acts.test_utils.tel.tel_test_utils import wifi_toggle_state
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_iwlan
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_volte
+from acts.test_utils.tel.tel_voice_utils import phone_setup_iwlan
+from acts.test_utils.tel.tel_voice_utils import phone_setup_iwlan_cellular_preferred
class TelLivePreflightTest(TelephonyBaseTest):
diff --git a/acts_tests/tests/google/tel/live/TelLiveProjectFiTest.py b/acts_tests/tests/google/tel/live/TelLiveProjectFiTest.py
index 5bf765e..a86939c 100644
--- a/acts_tests/tests/google/tel/live/TelLiveProjectFiTest.py
+++ b/acts_tests/tests/google/tel/live/TelLiveProjectFiTest.py
@@ -20,24 +20,24 @@
import time
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
-from acts_contrib.test_utils.tel.tel_defines import CARRIER_SPT
-from acts_contrib.test_utils.tel.tel_defines import CARRIER_TMO
-from acts_contrib.test_utils.tel.tel_defines import CARRIER_USCC
-from acts_contrib.test_utils.tel.tel_lookup_tables import operator_name_from_plmn_id
-from acts_contrib.test_utils.tel.tel_test_utils import abort_all_tests
-from acts_contrib.test_utils.tel.tel_test_utils import ensure_phone_subscription
-from acts_contrib.test_utils.tel.tel_test_utils import ensure_wifi_connected
-from acts_contrib.test_utils.tel.tel_test_utils import is_sim_ready
-from acts_contrib.test_utils.tel.tel_test_utils import log_screen_shot
-from acts_contrib.test_utils.tel.tel_test_utils import multithread_func
-from acts_contrib.test_utils.tel.tel_test_utils import reboot_device
-from acts_contrib.test_utils.tel.tel_test_utils import refresh_droid_config
-from acts_contrib.test_utils.tel.tel_test_utils import send_dialer_secret_code
-from acts_contrib.test_utils.tel.tel_test_utils import toggle_airplane_mode_by_adb
-from acts_contrib.test_utils.tel.tel_test_utils import wait_for_state
-from acts_contrib.test_utils.tel.tel_test_utils import add_google_account
-from acts_contrib.test_utils.tel.tel_test_utils import remove_google_account
+from acts.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
+from acts.test_utils.tel.tel_defines import CARRIER_SPT
+from acts.test_utils.tel.tel_defines import CARRIER_TMO
+from acts.test_utils.tel.tel_defines import CARRIER_USCC
+from acts.test_utils.tel.tel_lookup_tables import operator_name_from_plmn_id
+from acts.test_utils.tel.tel_test_utils import abort_all_tests
+from acts.test_utils.tel.tel_test_utils import ensure_phone_subscription
+from acts.test_utils.tel.tel_test_utils import ensure_wifi_connected
+from acts.test_utils.tel.tel_test_utils import is_sim_ready
+from acts.test_utils.tel.tel_test_utils import log_screen_shot
+from acts.test_utils.tel.tel_test_utils import multithread_func
+from acts.test_utils.tel.tel_test_utils import reboot_device
+from acts.test_utils.tel.tel_test_utils import refresh_droid_config
+from acts.test_utils.tel.tel_test_utils import send_dialer_secret_code
+from acts.test_utils.tel.tel_test_utils import toggle_airplane_mode_by_adb
+from acts.test_utils.tel.tel_test_utils import wait_for_state
+from acts.test_utils.tel.tel_test_utils import add_google_account
+from acts.test_utils.tel.tel_test_utils import remove_google_account
CARRIER_AUTO = "auto"
diff --git a/acts_tests/tests/google/tel/live/TelLiveRebootStressTest.py b/acts_tests/tests/google/tel/live/TelLiveRebootStressTest.py
index bbfea86..1fd39eb 100644
--- a/acts_tests/tests/google/tel/live/TelLiveRebootStressTest.py
+++ b/acts_tests/tests/google/tel/live/TelLiveRebootStressTest.py
@@ -23,57 +23,57 @@
from acts import signals
from acts.test_decorators import test_tracker_info
from acts.controllers.sl4a_lib.sl4a_types import Sl4aNetworkInfo
-from acts_contrib.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
-from acts_contrib.test_utils.tel.tel_data_utils import wifi_tethering_setup_teardown
-from acts_contrib.test_utils.tel.tel_defines import CAPABILITY_VOLTE
-from acts_contrib.test_utils.tel.tel_defines import CAPABILITY_VT
-from acts_contrib.test_utils.tel.tel_defines import CAPABILITY_WFC
-from acts_contrib.test_utils.tel.tel_defines import CAPABILITY_OMADM
-from acts_contrib.test_utils.tel.tel_defines import MAX_WAIT_TIME_TETHERING_ENTITLEMENT_CHECK
-from acts_contrib.test_utils.tel.tel_defines import NETWORK_SERVICE_DATA
-from acts_contrib.test_utils.tel.tel_defines import GEN_4G
-from acts_contrib.test_utils.tel.tel_defines import RAT_FAMILY_WLAN
-from acts_contrib.test_utils.tel.tel_defines import TETHERING_MODE_WIFI
-from acts_contrib.test_utils.tel.tel_defines import WAIT_TIME_AFTER_REBOOT
-from acts_contrib.test_utils.tel.tel_defines import WAIT_TIME_AFTER_CRASH
-from acts_contrib.test_utils.tel.tel_defines import WFC_MODE_CELLULAR_PREFERRED
-from acts_contrib.test_utils.tel.tel_defines import WFC_MODE_WIFI_PREFERRED
-from acts_contrib.test_utils.tel.tel_defines import VT_STATE_BIDIRECTIONAL
-from acts_contrib.test_utils.tel.tel_test_utils import call_setup_teardown
-from acts_contrib.test_utils.tel.tel_test_utils import ensure_phone_subscription
-from acts_contrib.test_utils.tel.tel_test_utils import get_model_name
-from acts_contrib.test_utils.tel.tel_test_utils import get_outgoing_voice_sub_id
-from acts_contrib.test_utils.tel.tel_test_utils import get_slot_index_from_subid
-from acts_contrib.test_utils.tel.tel_test_utils import is_droid_in_network_generation
-from acts_contrib.test_utils.tel.tel_test_utils import is_sim_locked
-from acts_contrib.test_utils.tel.tel_test_utils import mms_send_receive_verify
-from acts_contrib.test_utils.tel.tel_test_utils import power_off_sim
-from acts_contrib.test_utils.tel.tel_test_utils import power_on_sim
-from acts_contrib.test_utils.tel.tel_test_utils import reboot_device
-from acts_contrib.test_utils.tel.tel_test_utils import sms_send_receive_verify
-from acts_contrib.test_utils.tel.tel_test_utils import toggle_airplane_mode
-from acts_contrib.test_utils.tel.tel_test_utils import trigger_modem_crash
-from acts_contrib.test_utils.tel.tel_test_utils import trigger_modem_crash_by_modem
-from acts_contrib.test_utils.tel.tel_test_utils import unlock_sim
-from acts_contrib.test_utils.tel.tel_test_utils import wait_for_wfc_enabled
-from acts_contrib.test_utils.tel.tel_test_utils import wait_for_cell_data_connection
-from acts_contrib.test_utils.tel.tel_test_utils import wait_for_network_generation
-from acts_contrib.test_utils.tel.tel_test_utils import wait_for_network_rat
-from acts_contrib.test_utils.tel.tel_test_utils import wait_for_wifi_data_connection
-from acts_contrib.test_utils.tel.tel_test_utils import verify_internet_connection
-from acts_contrib.test_utils.tel.tel_test_utils import wait_for_state
-from acts_contrib.test_utils.tel.tel_voice_utils import is_phone_in_call_3g
-from acts_contrib.test_utils.tel.tel_voice_utils import is_phone_in_call_csfb
-from acts_contrib.test_utils.tel.tel_voice_utils import is_phone_in_call_iwlan
-from acts_contrib.test_utils.tel.tel_voice_utils import is_phone_in_call_volte
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_idle_volte
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_voice_3g
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_csfb
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_iwlan
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_volte
-from acts_contrib.test_utils.tel.tel_video_utils import video_call_setup_teardown
-from acts_contrib.test_utils.tel.tel_video_utils import phone_setup_video
-from acts_contrib.test_utils.tel.tel_video_utils import \
+from acts.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
+from acts.test_utils.tel.tel_data_utils import wifi_tethering_setup_teardown
+from acts.test_utils.tel.tel_defines import CAPABILITY_VOLTE
+from acts.test_utils.tel.tel_defines import CAPABILITY_VT
+from acts.test_utils.tel.tel_defines import CAPABILITY_WFC
+from acts.test_utils.tel.tel_defines import CAPABILITY_OMADM
+from acts.test_utils.tel.tel_defines import MAX_WAIT_TIME_TETHERING_ENTITLEMENT_CHECK
+from acts.test_utils.tel.tel_defines import NETWORK_SERVICE_DATA
+from acts.test_utils.tel.tel_defines import GEN_4G
+from acts.test_utils.tel.tel_defines import RAT_FAMILY_WLAN
+from acts.test_utils.tel.tel_defines import TETHERING_MODE_WIFI
+from acts.test_utils.tel.tel_defines import WAIT_TIME_AFTER_REBOOT
+from acts.test_utils.tel.tel_defines import WAIT_TIME_AFTER_CRASH
+from acts.test_utils.tel.tel_defines import WFC_MODE_CELLULAR_PREFERRED
+from acts.test_utils.tel.tel_defines import WFC_MODE_WIFI_PREFERRED
+from acts.test_utils.tel.tel_defines import VT_STATE_BIDIRECTIONAL
+from acts.test_utils.tel.tel_test_utils import call_setup_teardown
+from acts.test_utils.tel.tel_test_utils import ensure_phone_subscription
+from acts.test_utils.tel.tel_test_utils import get_model_name
+from acts.test_utils.tel.tel_test_utils import get_outgoing_voice_sub_id
+from acts.test_utils.tel.tel_test_utils import get_slot_index_from_subid
+from acts.test_utils.tel.tel_test_utils import is_droid_in_network_generation
+from acts.test_utils.tel.tel_test_utils import is_sim_locked
+from acts.test_utils.tel.tel_test_utils import mms_send_receive_verify
+from acts.test_utils.tel.tel_test_utils import power_off_sim
+from acts.test_utils.tel.tel_test_utils import power_on_sim
+from acts.test_utils.tel.tel_test_utils import reboot_device
+from acts.test_utils.tel.tel_test_utils import sms_send_receive_verify
+from acts.test_utils.tel.tel_test_utils import toggle_airplane_mode
+from acts.test_utils.tel.tel_test_utils import trigger_modem_crash
+from acts.test_utils.tel.tel_test_utils import trigger_modem_crash_by_modem
+from acts.test_utils.tel.tel_test_utils import unlock_sim
+from acts.test_utils.tel.tel_test_utils import wait_for_wfc_enabled
+from acts.test_utils.tel.tel_test_utils import wait_for_cell_data_connection
+from acts.test_utils.tel.tel_test_utils import wait_for_network_generation
+from acts.test_utils.tel.tel_test_utils import wait_for_network_rat
+from acts.test_utils.tel.tel_test_utils import wait_for_wifi_data_connection
+from acts.test_utils.tel.tel_test_utils import verify_internet_connection
+from acts.test_utils.tel.tel_test_utils import wait_for_state
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_3g
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_csfb
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_iwlan
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_volte
+from acts.test_utils.tel.tel_voice_utils import phone_idle_volte
+from acts.test_utils.tel.tel_voice_utils import phone_setup_voice_3g
+from acts.test_utils.tel.tel_voice_utils import phone_setup_csfb
+from acts.test_utils.tel.tel_voice_utils import phone_setup_iwlan
+from acts.test_utils.tel.tel_voice_utils import phone_setup_volte
+from acts.test_utils.tel.tel_video_utils import video_call_setup_teardown
+from acts.test_utils.tel.tel_video_utils import phone_setup_video
+from acts.test_utils.tel.tel_video_utils import \
is_phone_in_call_video_bidirectional
from acts.utils import get_current_epoch_time
diff --git a/acts_tests/tests/google/tel/live/TelLiveSettingsTest.py b/acts_tests/tests/google/tel/live/TelLiveSettingsTest.py
index 879353e..10b045f 100644
--- a/acts_tests/tests/google/tel/live/TelLiveSettingsTest.py
+++ b/acts_tests/tests/google/tel/live/TelLiveSettingsTest.py
@@ -24,23 +24,23 @@
from acts.keys import Config
from acts.utils import unzip_maintain_permissions
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
-from acts_contrib.test_utils.tel.tel_defines import MAX_WAIT_TIME_FOR_STATE_CHANGE
-from acts_contrib.test_utils.tel.tel_test_utils import dumpsys_carrier_config
-from acts_contrib.test_utils.tel.tel_test_utils import ensure_phone_subscription
-from acts_contrib.test_utils.tel.tel_test_utils import flash_radio
-from acts_contrib.test_utils.tel.tel_test_utils import get_outgoing_voice_sub_id
-from acts_contrib.test_utils.tel.tel_test_utils import get_slot_index_from_subid
-from acts_contrib.test_utils.tel.tel_test_utils import is_sim_locked
-from acts_contrib.test_utils.tel.tel_test_utils import multithread_func
-from acts_contrib.test_utils.tel.tel_test_utils import power_off_sim
-from acts_contrib.test_utils.tel.tel_test_utils import power_on_sim
-from acts_contrib.test_utils.tel.tel_test_utils import print_radio_info
-from acts_contrib.test_utils.tel.tel_test_utils import revert_default_telephony_setting
-from acts_contrib.test_utils.tel.tel_test_utils import set_qxdm_logger_command
-from acts_contrib.test_utils.tel.tel_test_utils import system_file_push
-from acts_contrib.test_utils.tel.tel_test_utils import unlock_sim
-from acts_contrib.test_utils.tel.tel_test_utils import verify_default_telephony_setting
+from acts.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
+from acts.test_utils.tel.tel_defines import MAX_WAIT_TIME_FOR_STATE_CHANGE
+from acts.test_utils.tel.tel_test_utils import dumpsys_carrier_config
+from acts.test_utils.tel.tel_test_utils import ensure_phone_subscription
+from acts.test_utils.tel.tel_test_utils import flash_radio
+from acts.test_utils.tel.tel_test_utils import get_outgoing_voice_sub_id
+from acts.test_utils.tel.tel_test_utils import get_slot_index_from_subid
+from acts.test_utils.tel.tel_test_utils import is_sim_locked
+from acts.test_utils.tel.tel_test_utils import multithread_func
+from acts.test_utils.tel.tel_test_utils import power_off_sim
+from acts.test_utils.tel.tel_test_utils import power_on_sim
+from acts.test_utils.tel.tel_test_utils import print_radio_info
+from acts.test_utils.tel.tel_test_utils import revert_default_telephony_setting
+from acts.test_utils.tel.tel_test_utils import set_qxdm_logger_command
+from acts.test_utils.tel.tel_test_utils import system_file_push
+from acts.test_utils.tel.tel_test_utils import unlock_sim
+from acts.test_utils.tel.tel_test_utils import verify_default_telephony_setting
from acts.utils import set_mobile_data_always_on
diff --git a/acts_tests/tests/google/tel/live/TelLiveSmokeTest.py b/acts_tests/tests/google/tel/live/TelLiveSmokeTest.py
index 0b8ce5d..ac536cf 100644
--- a/acts_tests/tests/google/tel/live/TelLiveSmokeTest.py
+++ b/acts_tests/tests/google/tel/live/TelLiveSmokeTest.py
@@ -19,35 +19,35 @@
import time
from acts.keys import Config
-from acts_contrib.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
-from acts_contrib.test_utils.tel.tel_data_utils import airplane_mode_test
-from acts_contrib.test_utils.tel.tel_data_utils import wifi_cell_switching
-from acts_contrib.test_utils.tel.tel_data_utils import wifi_tethering_setup_teardown
-from acts_contrib.test_utils.tel.tel_defines import GEN_4G
-from acts_contrib.test_utils.tel.tel_defines import MAX_WAIT_TIME_TETHERING_ENTITLEMENT_CHECK
-from acts_contrib.test_utils.tel.tel_defines import TETHERING_MODE_WIFI
-from acts_contrib.test_utils.tel.tel_defines import NETWORK_SERVICE_VOICE
-from acts_contrib.test_utils.tel.tel_defines import WAIT_TIME_IN_CALL_FOR_IMS
-from acts_contrib.test_utils.tel.tel_defines import WFC_MODE_WIFI_PREFERRED
-from acts_contrib.test_utils.tel.tel_lookup_tables import is_rat_svd_capable
-from acts_contrib.test_utils.tel.tel_test_utils import stop_wifi_tethering
-from acts_contrib.test_utils.tel.tel_test_utils import call_setup_teardown
-from acts_contrib.test_utils.tel.tel_test_utils import ensure_phones_default_state
-from acts_contrib.test_utils.tel.tel_test_utils import get_network_rat
-from acts_contrib.test_utils.tel.tel_test_utils import hangup_call
-from acts_contrib.test_utils.tel.tel_test_utils import multithread_func
-from acts_contrib.test_utils.tel.tel_test_utils import sms_send_receive_verify
-from acts_contrib.test_utils.tel.tel_test_utils import verify_http_connection
-from acts_contrib.test_utils.tel.tel_test_utils import wait_for_cell_data_connection
-from acts_contrib.test_utils.tel.tel_test_utils import WIFI_CONFIG_APBAND_2G
-from acts_contrib.test_utils.tel.tel_voice_utils import is_phone_in_call_3g
-from acts_contrib.test_utils.tel.tel_voice_utils import is_phone_in_call_csfb
-from acts_contrib.test_utils.tel.tel_voice_utils import is_phone_in_call_iwlan
-from acts_contrib.test_utils.tel.tel_voice_utils import is_phone_in_call_volte
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_voice_3g
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_csfb
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_iwlan
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_volte
+from acts.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
+from acts.test_utils.tel.tel_data_utils import airplane_mode_test
+from acts.test_utils.tel.tel_data_utils import wifi_cell_switching
+from acts.test_utils.tel.tel_data_utils import wifi_tethering_setup_teardown
+from acts.test_utils.tel.tel_defines import GEN_4G
+from acts.test_utils.tel.tel_defines import MAX_WAIT_TIME_TETHERING_ENTITLEMENT_CHECK
+from acts.test_utils.tel.tel_defines import TETHERING_MODE_WIFI
+from acts.test_utils.tel.tel_defines import NETWORK_SERVICE_VOICE
+from acts.test_utils.tel.tel_defines import WAIT_TIME_IN_CALL_FOR_IMS
+from acts.test_utils.tel.tel_defines import WFC_MODE_WIFI_PREFERRED
+from acts.test_utils.tel.tel_lookup_tables import is_rat_svd_capable
+from acts.test_utils.tel.tel_test_utils import stop_wifi_tethering
+from acts.test_utils.tel.tel_test_utils import call_setup_teardown
+from acts.test_utils.tel.tel_test_utils import ensure_phones_default_state
+from acts.test_utils.tel.tel_test_utils import get_network_rat
+from acts.test_utils.tel.tel_test_utils import hangup_call
+from acts.test_utils.tel.tel_test_utils import multithread_func
+from acts.test_utils.tel.tel_test_utils import sms_send_receive_verify
+from acts.test_utils.tel.tel_test_utils import verify_http_connection
+from acts.test_utils.tel.tel_test_utils import wait_for_cell_data_connection
+from acts.test_utils.tel.tel_test_utils import WIFI_CONFIG_APBAND_2G
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_3g
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_csfb
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_iwlan
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_volte
+from acts.test_utils.tel.tel_voice_utils import phone_setup_voice_3g
+from acts.test_utils.tel.tel_voice_utils import phone_setup_csfb
+from acts.test_utils.tel.tel_voice_utils import phone_setup_iwlan
+from acts.test_utils.tel.tel_voice_utils import phone_setup_volte
from acts.utils import rand_ascii_str
SKIP = 'Skip'
diff --git a/acts_tests/tests/google/tel/live/TelLiveSmsTest.py b/acts_tests/tests/google/tel/live/TelLiveSmsTest.py
index 3fa07b1..57c241c 100644
--- a/acts_tests/tests/google/tel/live/TelLiveSmsTest.py
+++ b/acts_tests/tests/google/tel/live/TelLiveSmsTest.py
@@ -20,59 +20,59 @@
import time
from acts import signals
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
-from acts_contrib.test_utils.tel.tel_defines import GEN_3G
-from acts_contrib.test_utils.tel.tel_defines import GEN_4G
-from acts_contrib.test_utils.tel.tel_defines import PHONE_TYPE_GSM
-from acts_contrib.test_utils.tel.tel_defines import RAT_3G
-from acts_contrib.test_utils.tel.tel_defines import VT_STATE_BIDIRECTIONAL
-from acts_contrib.test_utils.tel.tel_defines import WAIT_TIME_ANDROID_STATE_SETTLING
-from acts_contrib.test_utils.tel.tel_defines import WFC_MODE_DISABLED
-from acts_contrib.test_utils.tel.tel_defines import WFC_MODE_WIFI_PREFERRED
-from acts_contrib.test_utils.tel.tel_defines import WFC_MODE_CELLULAR_PREFERRED
-from acts_contrib.test_utils.tel.tel_subscription_utils import get_outgoing_message_sub_id
-from acts_contrib.test_utils.tel.tel_test_utils import call_setup_teardown
-from acts_contrib.test_utils.tel.tel_test_utils import ensure_network_generation
-from acts_contrib.test_utils.tel.tel_test_utils import ensure_phone_default_state
-from acts_contrib.test_utils.tel.tel_test_utils import ensure_phones_idle
-from acts_contrib.test_utils.tel.tel_test_utils import ensure_wifi_connected
-from acts_contrib.test_utils.tel.tel_test_utils import get_mobile_data_usage
-from acts_contrib.test_utils.tel.tel_test_utils import get_operator_name
-from acts_contrib.test_utils.tel.tel_test_utils import remove_mobile_data_usage_limit
-from acts_contrib.test_utils.tel.tel_test_utils import mms_send_receive_verify
-from acts_contrib.test_utils.tel.tel_test_utils import mms_receive_verify_after_call_hangup
-from acts_contrib.test_utils.tel.tel_test_utils import multithread_func
-from acts_contrib.test_utils.tel.tel_test_utils import set_preferred_mode_for_5g
-from acts_contrib.test_utils.tel.tel_test_utils import is_current_network_5g_nsa
-from acts_contrib.test_utils.tel.tel_test_utils import set_call_state_listen_level
-from acts_contrib.test_utils.tel.tel_test_utils import set_mobile_data_usage_limit
-from acts_contrib.test_utils.tel.tel_test_utils import setup_sim
-from acts_contrib.test_utils.tel.tel_test_utils import sms_send_receive_verify
-from acts_contrib.test_utils.tel.tel_test_utils import set_wfc_mode
-from acts_contrib.test_utils.tel.tel_test_utils import toggle_airplane_mode
-from acts_contrib.test_utils.tel.tel_test_utils import \
+from acts.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
+from acts.test_utils.tel.tel_defines import GEN_3G
+from acts.test_utils.tel.tel_defines import GEN_4G
+from acts.test_utils.tel.tel_defines import PHONE_TYPE_GSM
+from acts.test_utils.tel.tel_defines import RAT_3G
+from acts.test_utils.tel.tel_defines import VT_STATE_BIDIRECTIONAL
+from acts.test_utils.tel.tel_defines import WAIT_TIME_ANDROID_STATE_SETTLING
+from acts.test_utils.tel.tel_defines import WFC_MODE_DISABLED
+from acts.test_utils.tel.tel_defines import WFC_MODE_WIFI_PREFERRED
+from acts.test_utils.tel.tel_defines import WFC_MODE_CELLULAR_PREFERRED
+from acts.test_utils.tel.tel_subscription_utils import get_outgoing_message_sub_id
+from acts.test_utils.tel.tel_test_utils import call_setup_teardown
+from acts.test_utils.tel.tel_test_utils import ensure_network_generation
+from acts.test_utils.tel.tel_test_utils import ensure_phone_default_state
+from acts.test_utils.tel.tel_test_utils import ensure_phones_idle
+from acts.test_utils.tel.tel_test_utils import ensure_wifi_connected
+from acts.test_utils.tel.tel_test_utils import get_mobile_data_usage
+from acts.test_utils.tel.tel_test_utils import get_operator_name
+from acts.test_utils.tel.tel_test_utils import remove_mobile_data_usage_limit
+from acts.test_utils.tel.tel_test_utils import mms_send_receive_verify
+from acts.test_utils.tel.tel_test_utils import mms_receive_verify_after_call_hangup
+from acts.test_utils.tel.tel_test_utils import multithread_func
+from acts.test_utils.tel.tel_test_utils import set_preferred_mode_for_5g
+from acts.test_utils.tel.tel_test_utils import is_current_network_5g_nsa
+from acts.test_utils.tel.tel_test_utils import set_call_state_listen_level
+from acts.test_utils.tel.tel_test_utils import set_mobile_data_usage_limit
+from acts.test_utils.tel.tel_test_utils import setup_sim
+from acts.test_utils.tel.tel_test_utils import sms_send_receive_verify
+from acts.test_utils.tel.tel_test_utils import set_wfc_mode
+from acts.test_utils.tel.tel_test_utils import toggle_airplane_mode
+from acts.test_utils.tel.tel_test_utils import \
sms_in_collision_send_receive_verify
-from acts_contrib.test_utils.tel.tel_test_utils import \
+from acts.test_utils.tel.tel_test_utils import \
sms_rx_power_off_multiple_send_receive_verify
-from acts_contrib.test_utils.tel.tel_video_utils import phone_setup_video
-from acts_contrib.test_utils.tel.tel_video_utils import is_phone_in_call_video_bidirectional
-from acts_contrib.test_utils.tel.tel_video_utils import video_call_setup_teardown
-from acts_contrib.test_utils.tel.tel_voice_utils import is_phone_in_call_1x
-from acts_contrib.test_utils.tel.tel_voice_utils import is_phone_in_call_2g
-from acts_contrib.test_utils.tel.tel_voice_utils import is_phone_in_call_3g
-from acts_contrib.test_utils.tel.tel_voice_utils import is_phone_in_call_csfb
-from acts_contrib.test_utils.tel.tel_voice_utils import is_phone_in_call_iwlan
-from acts_contrib.test_utils.tel.tel_voice_utils import is_phone_in_call_not_iwlan
-from acts_contrib.test_utils.tel.tel_voice_utils import is_phone_in_call_volte
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_3g
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_csfb
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_data_general
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_iwlan
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_iwlan_cellular_preferred
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_voice_2g
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_voice_3g
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_volte
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_voice_general
+from acts.test_utils.tel.tel_video_utils import phone_setup_video
+from acts.test_utils.tel.tel_video_utils import is_phone_in_call_video_bidirectional
+from acts.test_utils.tel.tel_video_utils import video_call_setup_teardown
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_1x
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_2g
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_3g
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_csfb
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_iwlan
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_not_iwlan
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_volte
+from acts.test_utils.tel.tel_voice_utils import phone_setup_3g
+from acts.test_utils.tel.tel_voice_utils import phone_setup_csfb
+from acts.test_utils.tel.tel_voice_utils import phone_setup_data_general
+from acts.test_utils.tel.tel_voice_utils import phone_setup_iwlan
+from acts.test_utils.tel.tel_voice_utils import phone_setup_iwlan_cellular_preferred
+from acts.test_utils.tel.tel_voice_utils import phone_setup_voice_2g
+from acts.test_utils.tel.tel_voice_utils import phone_setup_voice_3g
+from acts.test_utils.tel.tel_voice_utils import phone_setup_volte
+from acts.test_utils.tel.tel_voice_utils import phone_setup_voice_general
from acts.utils import rand_ascii_str
SMS_OVER_WIFI_PROVIDERS = ("vzw", "tmo", "fi", "rogers", "rjio", "eeuk",
diff --git a/acts_tests/tests/google/tel/live/TelLiveStressCallTest.py b/acts_tests/tests/google/tel/live/TelLiveStressCallTest.py
index dc7a62e..3f30cd2 100644
--- a/acts_tests/tests/google/tel/live/TelLiveStressCallTest.py
+++ b/acts_tests/tests/google/tel/live/TelLiveStressCallTest.py
@@ -20,36 +20,36 @@
import collections
import time
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
-from acts_contrib.test_utils.tel.tel_defines import WFC_MODE_WIFI_PREFERRED
-from acts_contrib.test_utils.tel.tel_defines import VT_STATE_BIDIRECTIONAL
-from acts_contrib.test_utils.tel.tel_defines import WAIT_TIME_IN_CALL
-from acts_contrib.test_utils.tel.tel_test_utils import call_setup_teardown
-from acts_contrib.test_utils.tel.tel_test_utils import ensure_phone_subscription
-from acts_contrib.test_utils.tel.tel_test_utils import ensure_phones_idle
-from acts_contrib.test_utils.tel.tel_test_utils import ensure_wifi_connected
-from acts_contrib.test_utils.tel.tel_test_utils import last_call_drop_reason
-from acts_contrib.test_utils.tel.tel_test_utils import hangup_call
-from acts_contrib.test_utils.tel.tel_test_utils import set_wfc_mode
-from acts_contrib.test_utils.tel.tel_test_utils import sms_send_receive_verify
-from acts_contrib.test_utils.tel.tel_test_utils import start_qxdm_loggers
-from acts_contrib.test_utils.tel.tel_test_utils import verify_incall_state
-from acts_contrib.test_utils.tel.tel_test_utils import multithread_func
-from acts_contrib.test_utils.tel.tel_test_utils import toggle_airplane_mode
-from acts_contrib.test_utils.tel.tel_voice_utils import is_phone_in_call_3g
-from acts_contrib.test_utils.tel.tel_voice_utils import is_phone_in_call_2g
-from acts_contrib.test_utils.tel.tel_voice_utils import is_phone_in_call_csfb
-from acts_contrib.test_utils.tel.tel_voice_utils import is_phone_in_call_iwlan
-from acts_contrib.test_utils.tel.tel_voice_utils import is_phone_in_call_volte
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_csfb
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_iwlan
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_voice_3g
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_voice_2g
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_volte
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_idle_iwlan
-from acts_contrib.test_utils.tel.tel_video_utils import phone_setup_video
-from acts_contrib.test_utils.tel.tel_video_utils import video_call_setup
-from acts_contrib.test_utils.tel.tel_video_utils import \
+from acts.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
+from acts.test_utils.tel.tel_defines import WFC_MODE_WIFI_PREFERRED
+from acts.test_utils.tel.tel_defines import VT_STATE_BIDIRECTIONAL
+from acts.test_utils.tel.tel_defines import WAIT_TIME_IN_CALL
+from acts.test_utils.tel.tel_test_utils import call_setup_teardown
+from acts.test_utils.tel.tel_test_utils import ensure_phone_subscription
+from acts.test_utils.tel.tel_test_utils import ensure_phones_idle
+from acts.test_utils.tel.tel_test_utils import ensure_wifi_connected
+from acts.test_utils.tel.tel_test_utils import last_call_drop_reason
+from acts.test_utils.tel.tel_test_utils import hangup_call
+from acts.test_utils.tel.tel_test_utils import set_wfc_mode
+from acts.test_utils.tel.tel_test_utils import sms_send_receive_verify
+from acts.test_utils.tel.tel_test_utils import start_qxdm_loggers
+from acts.test_utils.tel.tel_test_utils import verify_incall_state
+from acts.test_utils.tel.tel_test_utils import multithread_func
+from acts.test_utils.tel.tel_test_utils import toggle_airplane_mode
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_3g
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_2g
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_csfb
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_iwlan
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_volte
+from acts.test_utils.tel.tel_voice_utils import phone_setup_csfb
+from acts.test_utils.tel.tel_voice_utils import phone_setup_iwlan
+from acts.test_utils.tel.tel_voice_utils import phone_setup_voice_3g
+from acts.test_utils.tel.tel_voice_utils import phone_setup_voice_2g
+from acts.test_utils.tel.tel_voice_utils import phone_setup_volte
+from acts.test_utils.tel.tel_voice_utils import phone_idle_iwlan
+from acts.test_utils.tel.tel_video_utils import phone_setup_video
+from acts.test_utils.tel.tel_video_utils import video_call_setup
+from acts.test_utils.tel.tel_video_utils import \
is_phone_in_call_video_bidirectional
from acts.logger import epoch_to_log_line_timestamp
from acts.utils import get_current_epoch_time
diff --git a/acts_tests/tests/google/tel/live/TelLiveStressDataTest.py b/acts_tests/tests/google/tel/live/TelLiveStressDataTest.py
index 81e3ece..b8012ae 100644
--- a/acts_tests/tests/google/tel/live/TelLiveStressDataTest.py
+++ b/acts_tests/tests/google/tel/live/TelLiveStressDataTest.py
@@ -17,9 +17,9 @@
Test Script for Telephony Stress data Test
"""
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
-from acts_contrib.test_utils.tel.tel_test_utils import iperf_test_by_adb
-from acts_contrib.test_utils.tel.tel_test_utils import iperf_udp_test_by_adb
+from acts.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
+from acts.test_utils.tel.tel_test_utils import iperf_test_by_adb
+from acts.test_utils.tel.tel_test_utils import iperf_udp_test_by_adb
class TelLiveStressDataTest(TelephonyBaseTest):
diff --git a/acts_tests/tests/google/tel/live/TelLiveStressFdrTest.py b/acts_tests/tests/google/tel/live/TelLiveStressFdrTest.py
index 46bef20..ea0bbf8 100644
--- a/acts_tests/tests/google/tel/live/TelLiveStressFdrTest.py
+++ b/acts_tests/tests/google/tel/live/TelLiveStressFdrTest.py
@@ -22,34 +22,34 @@
from acts import signals
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
-from acts_contrib.test_utils.tel.tel_data_utils import wifi_tethering_setup_teardown
-from acts_contrib.test_utils.tel.tel_defines import CAPABILITY_VOLTE
-from acts_contrib.test_utils.tel.tel_defines import CAPABILITY_WFC
-from acts_contrib.test_utils.tel.tel_defines import CAPABILITY_OMADM
-from acts_contrib.test_utils.tel.tel_defines import MAX_WAIT_TIME_TETHERING_ENTITLEMENT_CHECK
-from acts_contrib.test_utils.tel.tel_defines import NETWORK_SERVICE_DATA
-from acts_contrib.test_utils.tel.tel_defines import GEN_4G
-from acts_contrib.test_utils.tel.tel_defines import TETHERING_MODE_WIFI
-from acts_contrib.test_utils.tel.tel_defines import WAIT_TIME_AFTER_FDR
-from acts_contrib.test_utils.tel.tel_test_utils import call_setup_teardown
-from acts_contrib.test_utils.tel.tel_test_utils import ensure_phone_subscription
-from acts_contrib.test_utils.tel.tel_test_utils import get_model_name
-from acts_contrib.test_utils.tel.tel_test_utils import get_outgoing_voice_sub_id
-from acts_contrib.test_utils.tel.tel_test_utils import is_droid_in_network_generation
-from acts_contrib.test_utils.tel.tel_test_utils import mms_send_receive_verify
-from acts_contrib.test_utils.tel.tel_test_utils import fastboot_wipe
-from acts_contrib.test_utils.tel.tel_test_utils import sms_send_receive_verify
-from acts_contrib.test_utils.tel.tel_test_utils import wait_for_network_generation
-from acts_contrib.test_utils.tel.tel_test_utils import verify_internet_connection
-from acts_contrib.test_utils.tel.tel_test_utils import wait_for_state
-from acts_contrib.test_utils.tel.tel_voice_utils import is_phone_in_call_3g
-from acts_contrib.test_utils.tel.tel_voice_utils import is_phone_in_call_csfb
-from acts_contrib.test_utils.tel.tel_voice_utils import is_phone_in_call_volte
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_idle_volte
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_voice_3g
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_csfb
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_volte
+from acts.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
+from acts.test_utils.tel.tel_data_utils import wifi_tethering_setup_teardown
+from acts.test_utils.tel.tel_defines import CAPABILITY_VOLTE
+from acts.test_utils.tel.tel_defines import CAPABILITY_WFC
+from acts.test_utils.tel.tel_defines import CAPABILITY_OMADM
+from acts.test_utils.tel.tel_defines import MAX_WAIT_TIME_TETHERING_ENTITLEMENT_CHECK
+from acts.test_utils.tel.tel_defines import NETWORK_SERVICE_DATA
+from acts.test_utils.tel.tel_defines import GEN_4G
+from acts.test_utils.tel.tel_defines import TETHERING_MODE_WIFI
+from acts.test_utils.tel.tel_defines import WAIT_TIME_AFTER_FDR
+from acts.test_utils.tel.tel_test_utils import call_setup_teardown
+from acts.test_utils.tel.tel_test_utils import ensure_phone_subscription
+from acts.test_utils.tel.tel_test_utils import get_model_name
+from acts.test_utils.tel.tel_test_utils import get_outgoing_voice_sub_id
+from acts.test_utils.tel.tel_test_utils import is_droid_in_network_generation
+from acts.test_utils.tel.tel_test_utils import mms_send_receive_verify
+from acts.test_utils.tel.tel_test_utils import fastboot_wipe
+from acts.test_utils.tel.tel_test_utils import sms_send_receive_verify
+from acts.test_utils.tel.tel_test_utils import wait_for_network_generation
+from acts.test_utils.tel.tel_test_utils import verify_internet_connection
+from acts.test_utils.tel.tel_test_utils import wait_for_state
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_3g
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_csfb
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_volte
+from acts.test_utils.tel.tel_voice_utils import phone_idle_volte
+from acts.test_utils.tel.tel_voice_utils import phone_setup_voice_3g
+from acts.test_utils.tel.tel_voice_utils import phone_setup_csfb
+from acts.test_utils.tel.tel_voice_utils import phone_setup_volte
from acts.utils import get_current_epoch_time
from acts.utils import rand_ascii_str
diff --git a/acts_tests/tests/google/tel/live/TelLiveStressTest.py b/acts_tests/tests/google/tel/live/TelLiveStressTest.py
index 497a44f..0bde255 100644
--- a/acts_tests/tests/google/tel/live/TelLiveStressTest.py
+++ b/acts_tests/tests/google/tel/live/TelLiveStressTest.py
@@ -27,78 +27,78 @@
from acts import signals
from acts.libs.proc import job
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.tel.loggers.telephony_metric_logger import TelephonyMetricLogger
-from acts_contrib.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
-from acts_contrib.test_utils.tel.tel_defines import CAPABILITY_VOLTE
-from acts_contrib.test_utils.tel.tel_defines import CAPABILITY_WFC
-from acts_contrib.test_utils.tel.tel_defines import GEN_3G
-from acts_contrib.test_utils.tel.tel_defines import GEN_4G
-from acts_contrib.test_utils.tel.tel_defines import INCALL_UI_DISPLAY_BACKGROUND
-from acts_contrib.test_utils.tel.tel_defines import MAX_WAIT_TIME_SMS_RECEIVE
-from acts_contrib.test_utils.tel.tel_defines import NETWORK_MODE_WCDMA_ONLY
-from acts_contrib.test_utils.tel.tel_defines import NETWORK_MODE_GLOBAL
-from acts_contrib.test_utils.tel.tel_defines import NETWORK_MODE_CDMA
-from acts_contrib.test_utils.tel.tel_defines import NETWORK_MODE_GSM_ONLY
-from acts_contrib.test_utils.tel.tel_defines import NETWORK_MODE_TDSCDMA_GSM_WCDMA
-from acts_contrib.test_utils.tel.tel_defines import WAIT_TIME_AFTER_MODE_CHANGE
-from acts_contrib.test_utils.tel.tel_defines import WFC_MODE_CELLULAR_PREFERRED
-from acts_contrib.test_utils.tel.tel_defines import WFC_MODE_WIFI_PREFERRED
-from acts_contrib.test_utils.tel.tel_defines import WAIT_TIME_CHANGE_MESSAGE_SUB_ID
-from acts_contrib.test_utils.tel.tel_defines import WAIT_TIME_CHANGE_VOICE_SUB_ID
-from acts_contrib.test_utils.tel.tel_defines import WAIT_TIME_FOR_CBRS_DATA_SWITCH
-from acts_contrib.test_utils.tel.tel_defines import CARRIER_SING
-from acts_contrib.test_utils.tel.tel_lookup_tables import is_rat_svd_capable
-from acts_contrib.test_utils.tel.tel_test_utils import STORY_LINE
-from acts_contrib.test_utils.tel.tel_test_utils import active_file_download_test
-from acts_contrib.test_utils.tel.tel_test_utils import is_phone_in_call
-from acts_contrib.test_utils.tel.tel_test_utils import call_setup_teardown
-from acts_contrib.test_utils.tel.tel_test_utils import ensure_network_generation_for_subscription
-from acts_contrib.test_utils.tel.tel_test_utils import ensure_wifi_connected
-from acts_contrib.test_utils.tel.tel_test_utils import extract_test_log
-from acts_contrib.test_utils.tel.tel_test_utils import force_connectivity_metrics_upload
-from acts_contrib.test_utils.tel.tel_test_utils import get_device_epoch_time
-from acts_contrib.test_utils.tel.tel_test_utils import get_telephony_signal_strength
-from acts_contrib.test_utils.tel.tel_test_utils import hangup_call
-from acts_contrib.test_utils.tel.tel_test_utils import hangup_call_by_adb
-from acts_contrib.test_utils.tel.tel_test_utils import initiate_call
-from acts_contrib.test_utils.tel.tel_test_utils import last_call_drop_reason
-from acts_contrib.test_utils.tel.tel_test_utils import run_multithread_func
-from acts_contrib.test_utils.tel.tel_test_utils import set_wfc_mode
-from acts_contrib.test_utils.tel.tel_test_utils import sms_send_receive_verify
-from acts_contrib.test_utils.tel.tel_test_utils import start_qxdm_loggers
-from acts_contrib.test_utils.tel.tel_test_utils import start_sdm_loggers
-from acts_contrib.test_utils.tel.tel_test_utils import start_adb_tcpdump
-from acts_contrib.test_utils.tel.tel_test_utils import synchronize_device_time
-from acts_contrib.test_utils.tel.tel_test_utils import mms_send_receive_verify
-from acts_contrib.test_utils.tel.tel_test_utils import set_preferred_network_mode_pref
-from acts_contrib.test_utils.tel.tel_test_utils import verify_internet_connection
-from acts_contrib.test_utils.tel.tel_test_utils import verify_internet_connection_by_ping
-from acts_contrib.test_utils.tel.tel_test_utils import verify_http_connection
-from acts_contrib.test_utils.tel.tel_test_utils import wait_for_call_id_clearing
-from acts_contrib.test_utils.tel.tel_test_utils import wait_for_data_connection
-from acts_contrib.test_utils.tel.tel_test_utils import wait_for_in_call_active
-from acts_contrib.test_utils.tel.tel_test_utils import is_current_data_on_cbrs
-from acts_contrib.test_utils.tel.tel_voice_utils import is_phone_in_call_3g
-from acts_contrib.test_utils.tel.tel_voice_utils import is_phone_in_call_2g
-from acts_contrib.test_utils.tel.tel_voice_utils import is_phone_in_call_csfb
-from acts_contrib.test_utils.tel.tel_voice_utils import is_phone_in_call_iwlan
-from acts_contrib.test_utils.tel.tel_voice_utils import is_phone_in_call_volte
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_csfb
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_iwlan
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_voice_3g
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_voice_2g
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_volte
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_idle_iwlan
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_idle_volte
-from acts_contrib.test_utils.tel.tel_voice_utils import get_current_voice_rat
-from acts_contrib.test_utils.tel.tel_subscription_utils import get_subid_from_slot_index
-from acts_contrib.test_utils.tel.tel_subscription_utils import get_operatorname_from_slot_index
-from acts_contrib.test_utils.tel.tel_subscription_utils import get_carrierid_from_slot_index
-from acts_contrib.test_utils.tel.tel_subscription_utils import get_isopportunistic_from_slot_index
-from acts_contrib.test_utils.tel.tel_subscription_utils import set_subid_for_data
-from acts_contrib.test_utils.tel.tel_subscription_utils import set_subid_for_message
-from acts_contrib.test_utils.tel.tel_subscription_utils import set_subid_for_outgoing_call
-from acts_contrib.test_utils.tel.tel_subscription_utils import set_slways_allow_mms_data
+from acts.test_utils.tel.loggers.telephony_metric_logger import TelephonyMetricLogger
+from acts.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
+from acts.test_utils.tel.tel_defines import CAPABILITY_VOLTE
+from acts.test_utils.tel.tel_defines import CAPABILITY_WFC
+from acts.test_utils.tel.tel_defines import GEN_3G
+from acts.test_utils.tel.tel_defines import GEN_4G
+from acts.test_utils.tel.tel_defines import INCALL_UI_DISPLAY_BACKGROUND
+from acts.test_utils.tel.tel_defines import MAX_WAIT_TIME_SMS_RECEIVE
+from acts.test_utils.tel.tel_defines import NETWORK_MODE_WCDMA_ONLY
+from acts.test_utils.tel.tel_defines import NETWORK_MODE_GLOBAL
+from acts.test_utils.tel.tel_defines import NETWORK_MODE_CDMA
+from acts.test_utils.tel.tel_defines import NETWORK_MODE_GSM_ONLY
+from acts.test_utils.tel.tel_defines import NETWORK_MODE_TDSCDMA_GSM_WCDMA
+from acts.test_utils.tel.tel_defines import WAIT_TIME_AFTER_MODE_CHANGE
+from acts.test_utils.tel.tel_defines import WFC_MODE_CELLULAR_PREFERRED
+from acts.test_utils.tel.tel_defines import WFC_MODE_WIFI_PREFERRED
+from acts.test_utils.tel.tel_defines import WAIT_TIME_CHANGE_MESSAGE_SUB_ID
+from acts.test_utils.tel.tel_defines import WAIT_TIME_CHANGE_VOICE_SUB_ID
+from acts.test_utils.tel.tel_defines import WAIT_TIME_FOR_CBRS_DATA_SWITCH
+from acts.test_utils.tel.tel_defines import CARRIER_SING
+from acts.test_utils.tel.tel_lookup_tables import is_rat_svd_capable
+from acts.test_utils.tel.tel_test_utils import STORY_LINE
+from acts.test_utils.tel.tel_test_utils import active_file_download_test
+from acts.test_utils.tel.tel_test_utils import is_phone_in_call
+from acts.test_utils.tel.tel_test_utils import call_setup_teardown
+from acts.test_utils.tel.tel_test_utils import ensure_network_generation_for_subscription
+from acts.test_utils.tel.tel_test_utils import ensure_wifi_connected
+from acts.test_utils.tel.tel_test_utils import extract_test_log
+from acts.test_utils.tel.tel_test_utils import force_connectivity_metrics_upload
+from acts.test_utils.tel.tel_test_utils import get_device_epoch_time
+from acts.test_utils.tel.tel_test_utils import get_telephony_signal_strength
+from acts.test_utils.tel.tel_test_utils import hangup_call
+from acts.test_utils.tel.tel_test_utils import hangup_call_by_adb
+from acts.test_utils.tel.tel_test_utils import initiate_call
+from acts.test_utils.tel.tel_test_utils import last_call_drop_reason
+from acts.test_utils.tel.tel_test_utils import run_multithread_func
+from acts.test_utils.tel.tel_test_utils import set_wfc_mode
+from acts.test_utils.tel.tel_test_utils import sms_send_receive_verify
+from acts.test_utils.tel.tel_test_utils import start_qxdm_loggers
+from acts.test_utils.tel.tel_test_utils import start_sdm_loggers
+from acts.test_utils.tel.tel_test_utils import start_adb_tcpdump
+from acts.test_utils.tel.tel_test_utils import synchronize_device_time
+from acts.test_utils.tel.tel_test_utils import mms_send_receive_verify
+from acts.test_utils.tel.tel_test_utils import set_preferred_network_mode_pref
+from acts.test_utils.tel.tel_test_utils import verify_internet_connection
+from acts.test_utils.tel.tel_test_utils import verify_internet_connection_by_ping
+from acts.test_utils.tel.tel_test_utils import verify_http_connection
+from acts.test_utils.tel.tel_test_utils import wait_for_call_id_clearing
+from acts.test_utils.tel.tel_test_utils import wait_for_data_connection
+from acts.test_utils.tel.tel_test_utils import wait_for_in_call_active
+from acts.test_utils.tel.tel_test_utils import is_current_data_on_cbrs
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_3g
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_2g
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_csfb
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_iwlan
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_volte
+from acts.test_utils.tel.tel_voice_utils import phone_setup_csfb
+from acts.test_utils.tel.tel_voice_utils import phone_setup_iwlan
+from acts.test_utils.tel.tel_voice_utils import phone_setup_voice_3g
+from acts.test_utils.tel.tel_voice_utils import phone_setup_voice_2g
+from acts.test_utils.tel.tel_voice_utils import phone_setup_volte
+from acts.test_utils.tel.tel_voice_utils import phone_idle_iwlan
+from acts.test_utils.tel.tel_voice_utils import phone_idle_volte
+from acts.test_utils.tel.tel_voice_utils import get_current_voice_rat
+from acts.test_utils.tel.tel_subscription_utils import get_subid_from_slot_index
+from acts.test_utils.tel.tel_subscription_utils import get_operatorname_from_slot_index
+from acts.test_utils.tel.tel_subscription_utils import get_carrierid_from_slot_index
+from acts.test_utils.tel.tel_subscription_utils import get_isopportunistic_from_slot_index
+from acts.test_utils.tel.tel_subscription_utils import set_subid_for_data
+from acts.test_utils.tel.tel_subscription_utils import set_subid_for_message
+from acts.test_utils.tel.tel_subscription_utils import set_subid_for_outgoing_call
+from acts.test_utils.tel.tel_subscription_utils import set_slways_allow_mms_data
from acts.utils import get_current_epoch_time
from acts.utils import rand_ascii_str
diff --git a/acts_tests/tests/google/tel/live/TelLiveVideoDataTest.py b/acts_tests/tests/google/tel/live/TelLiveVideoDataTest.py
index 8f86f9f..18dd7f7 100644
--- a/acts_tests/tests/google/tel/live/TelLiveVideoDataTest.py
+++ b/acts_tests/tests/google/tel/live/TelLiveVideoDataTest.py
@@ -16,15 +16,15 @@
"""
Test Script for VT Data test
"""
-from acts_contrib.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
-from acts_contrib.test_utils.tel.tel_defines import VT_STATE_BIDIRECTIONAL
-from acts_contrib.test_utils.tel.tel_test_utils import hangup_call
-from acts_contrib.test_utils.tel.tel_test_utils import multithread_func
-from acts_contrib.test_utils.tel.tel_test_utils import verify_http_connection
-from acts_contrib.test_utils.tel.tel_video_utils import \
+from acts.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
+from acts.test_utils.tel.tel_defines import VT_STATE_BIDIRECTIONAL
+from acts.test_utils.tel.tel_test_utils import hangup_call
+from acts.test_utils.tel.tel_test_utils import multithread_func
+from acts.test_utils.tel.tel_test_utils import verify_http_connection
+from acts.test_utils.tel.tel_video_utils import \
is_phone_in_call_video_bidirectional
-from acts_contrib.test_utils.tel.tel_video_utils import phone_setup_video
-from acts_contrib.test_utils.tel.tel_video_utils import video_call_setup_teardown
+from acts.test_utils.tel.tel_video_utils import phone_setup_video
+from acts.test_utils.tel.tel_video_utils import video_call_setup_teardown
class TelLiveVideoDataTest(TelephonyBaseTest):
diff --git a/acts_tests/tests/google/tel/live/TelLiveVideoTest.py b/acts_tests/tests/google/tel/live/TelLiveVideoTest.py
index de2e85a..107e05f 100644
--- a/acts_tests/tests/google/tel/live/TelLiveVideoTest.py
+++ b/acts_tests/tests/google/tel/live/TelLiveVideoTest.py
@@ -21,58 +21,58 @@
from queue import Empty
from acts import signals
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
-from acts_contrib.test_utils.tel.tel_defines import AUDIO_ROUTE_EARPIECE
-from acts_contrib.test_utils.tel.tel_defines import AUDIO_ROUTE_SPEAKER
-from acts_contrib.test_utils.tel.tel_defines import CALL_STATE_ACTIVE
-from acts_contrib.test_utils.tel.tel_defines import CALL_STATE_HOLDING
-from acts_contrib.test_utils.tel.tel_defines import CALL_CAPABILITY_MANAGE_CONFERENCE
-from acts_contrib.test_utils.tel.tel_defines import CALL_CAPABILITY_MERGE_CONFERENCE
-from acts_contrib.test_utils.tel.tel_defines import CALL_CAPABILITY_SWAP_CONFERENCE
-from acts_contrib.test_utils.tel.tel_defines import CALL_PROPERTY_CONFERENCE
-from acts_contrib.test_utils.tel.tel_defines import CAPABILITY_VT
-from acts_contrib.test_utils.tel.tel_defines import MAX_WAIT_TIME_VIDEO_SESSION_EVENT
-from acts_contrib.test_utils.tel.tel_defines import MAX_WAIT_TIME_VOLTE_ENABLED
-from acts_contrib.test_utils.tel.tel_defines import VT_STATE_AUDIO_ONLY
-from acts_contrib.test_utils.tel.tel_defines import VT_STATE_BIDIRECTIONAL
-from acts_contrib.test_utils.tel.tel_defines import VT_STATE_BIDIRECTIONAL_PAUSED
-from acts_contrib.test_utils.tel.tel_defines import VT_VIDEO_QUALITY_DEFAULT
-from acts_contrib.test_utils.tel.tel_defines import VT_STATE_RX_ENABLED
-from acts_contrib.test_utils.tel.tel_defines import VT_STATE_TX_ENABLED
-from acts_contrib.test_utils.tel.tel_defines import WAIT_TIME_ANDROID_STATE_SETTLING
-from acts_contrib.test_utils.tel.tel_defines import WAIT_TIME_IN_CALL
-from acts_contrib.test_utils.tel.tel_defines import EVENT_VIDEO_SESSION_EVENT
-from acts_contrib.test_utils.tel.tel_defines import EventTelecomVideoCallSessionEvent
-from acts_contrib.test_utils.tel.tel_defines import SESSION_EVENT_RX_PAUSE
-from acts_contrib.test_utils.tel.tel_defines import SESSION_EVENT_RX_RESUME
-from acts_contrib.test_utils.tel.tel_lookup_tables import operator_capabilities
-from acts_contrib.test_utils.tel.tel_subscription_utils import get_outgoing_voice_sub_id
-from acts_contrib.test_utils.tel.tel_test_utils import call_setup_teardown
-from acts_contrib.test_utils.tel.tel_test_utils import disconnect_call_by_id
-from acts_contrib.test_utils.tel.tel_test_utils import get_model_name
-from acts_contrib.test_utils.tel.tel_test_utils import get_operator_name
-from acts_contrib.test_utils.tel.tel_test_utils import hangup_call
-from acts_contrib.test_utils.tel.tel_test_utils import multithread_func
-from acts_contrib.test_utils.tel.tel_test_utils import num_active_calls
-from acts_contrib.test_utils.tel.tel_test_utils import verify_internet_connection
-from acts_contrib.test_utils.tel.tel_test_utils import verify_incall_state
-from acts_contrib.test_utils.tel.tel_test_utils import wait_for_video_enabled
-from acts_contrib.test_utils.tel.tel_test_utils import get_capability_for_subscription
-from acts_contrib.test_utils.tel.tel_video_utils import get_call_id_in_video_state
-from acts_contrib.test_utils.tel.tel_video_utils import \
+from acts.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
+from acts.test_utils.tel.tel_defines import AUDIO_ROUTE_EARPIECE
+from acts.test_utils.tel.tel_defines import AUDIO_ROUTE_SPEAKER
+from acts.test_utils.tel.tel_defines import CALL_STATE_ACTIVE
+from acts.test_utils.tel.tel_defines import CALL_STATE_HOLDING
+from acts.test_utils.tel.tel_defines import CALL_CAPABILITY_MANAGE_CONFERENCE
+from acts.test_utils.tel.tel_defines import CALL_CAPABILITY_MERGE_CONFERENCE
+from acts.test_utils.tel.tel_defines import CALL_CAPABILITY_SWAP_CONFERENCE
+from acts.test_utils.tel.tel_defines import CALL_PROPERTY_CONFERENCE
+from acts.test_utils.tel.tel_defines import CAPABILITY_VT
+from acts.test_utils.tel.tel_defines import MAX_WAIT_TIME_VIDEO_SESSION_EVENT
+from acts.test_utils.tel.tel_defines import MAX_WAIT_TIME_VOLTE_ENABLED
+from acts.test_utils.tel.tel_defines import VT_STATE_AUDIO_ONLY
+from acts.test_utils.tel.tel_defines import VT_STATE_BIDIRECTIONAL
+from acts.test_utils.tel.tel_defines import VT_STATE_BIDIRECTIONAL_PAUSED
+from acts.test_utils.tel.tel_defines import VT_VIDEO_QUALITY_DEFAULT
+from acts.test_utils.tel.tel_defines import VT_STATE_RX_ENABLED
+from acts.test_utils.tel.tel_defines import VT_STATE_TX_ENABLED
+from acts.test_utils.tel.tel_defines import WAIT_TIME_ANDROID_STATE_SETTLING
+from acts.test_utils.tel.tel_defines import WAIT_TIME_IN_CALL
+from acts.test_utils.tel.tel_defines import EVENT_VIDEO_SESSION_EVENT
+from acts.test_utils.tel.tel_defines import EventTelecomVideoCallSessionEvent
+from acts.test_utils.tel.tel_defines import SESSION_EVENT_RX_PAUSE
+from acts.test_utils.tel.tel_defines import SESSION_EVENT_RX_RESUME
+from acts.test_utils.tel.tel_lookup_tables import operator_capabilities
+from acts.test_utils.tel.tel_subscription_utils import get_outgoing_voice_sub_id
+from acts.test_utils.tel.tel_test_utils import call_setup_teardown
+from acts.test_utils.tel.tel_test_utils import disconnect_call_by_id
+from acts.test_utils.tel.tel_test_utils import get_model_name
+from acts.test_utils.tel.tel_test_utils import get_operator_name
+from acts.test_utils.tel.tel_test_utils import hangup_call
+from acts.test_utils.tel.tel_test_utils import multithread_func
+from acts.test_utils.tel.tel_test_utils import num_active_calls
+from acts.test_utils.tel.tel_test_utils import verify_internet_connection
+from acts.test_utils.tel.tel_test_utils import verify_incall_state
+from acts.test_utils.tel.tel_test_utils import wait_for_video_enabled
+from acts.test_utils.tel.tel_test_utils import get_capability_for_subscription
+from acts.test_utils.tel.tel_video_utils import get_call_id_in_video_state
+from acts.test_utils.tel.tel_video_utils import \
is_phone_in_call_video_bidirectional
-from acts_contrib.test_utils.tel.tel_video_utils import is_phone_in_call_voice_hd
-from acts_contrib.test_utils.tel.tel_video_utils import phone_setup_video
-from acts_contrib.test_utils.tel.tel_video_utils import \
+from acts.test_utils.tel.tel_video_utils import is_phone_in_call_voice_hd
+from acts.test_utils.tel.tel_video_utils import phone_setup_video
+from acts.test_utils.tel.tel_video_utils import \
verify_video_call_in_expected_state
-from acts_contrib.test_utils.tel.tel_video_utils import video_call_downgrade
-from acts_contrib.test_utils.tel.tel_video_utils import video_call_modify_video
-from acts_contrib.test_utils.tel.tel_video_utils import video_call_setup_teardown
-from acts_contrib.test_utils.tel.tel_voice_utils import get_audio_route
-from acts_contrib.test_utils.tel.tel_voice_utils import is_phone_in_call_volte
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_volte
-from acts_contrib.test_utils.tel.tel_voice_utils import set_audio_route
-from acts_contrib.test_utils.tel.tel_voice_utils import get_cep_conference_call_id
+from acts.test_utils.tel.tel_video_utils import video_call_downgrade
+from acts.test_utils.tel.tel_video_utils import video_call_modify_video
+from acts.test_utils.tel.tel_video_utils import video_call_setup_teardown
+from acts.test_utils.tel.tel_voice_utils import get_audio_route
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_volte
+from acts.test_utils.tel.tel_voice_utils import phone_setup_volte
+from acts.test_utils.tel.tel_voice_utils import set_audio_route
+from acts.test_utils.tel.tel_voice_utils import get_cep_conference_call_id
DEFAULT_LONG_DURATION_CALL_TOTAL_DURATION = 1 * 60 * 60 # default 1 hour
diff --git a/acts_tests/tests/google/tel/live/TelLiveVoiceConfTest.py b/acts_tests/tests/google/tel/live/TelLiveVoiceConfTest.py
index ab7ab00..ae7e18f 100644
--- a/acts_tests/tests/google/tel/live/TelLiveVoiceConfTest.py
+++ b/acts_tests/tests/google/tel/live/TelLiveVoiceConfTest.py
@@ -20,50 +20,50 @@
import time
from acts import signals
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
-from acts_contrib.test_utils.tel.tel_defines import CALL_CAPABILITY_MANAGE_CONFERENCE
-from acts_contrib.test_utils.tel.tel_defines import CALL_CAPABILITY_MERGE_CONFERENCE
-from acts_contrib.test_utils.tel.tel_defines import CALL_CAPABILITY_SWAP_CONFERENCE
-from acts_contrib.test_utils.tel.tel_defines import CALL_PROPERTY_CONFERENCE
-from acts_contrib.test_utils.tel.tel_defines import CALL_STATE_ACTIVE
-from acts_contrib.test_utils.tel.tel_defines import CALL_STATE_HOLDING
-from acts_contrib.test_utils.tel.tel_defines import CAPABILITY_CONFERENCE
-from acts_contrib.test_utils.tel.tel_defines import PHONE_TYPE_CDMA
-from acts_contrib.test_utils.tel.tel_defines import PHONE_TYPE_GSM
-from acts_contrib.test_utils.tel.tel_defines import WAIT_TIME_IN_CALL
-from acts_contrib.test_utils.tel.tel_defines import WFC_MODE_WIFI_ONLY
-from acts_contrib.test_utils.tel.tel_defines import WFC_MODE_WIFI_PREFERRED
-from acts_contrib.test_utils.tel.tel_subscription_utils import get_outgoing_voice_sub_id
-from acts_contrib.test_utils.tel.tel_test_utils import call_reject
-from acts_contrib.test_utils.tel.tel_test_utils import call_setup_teardown
-from acts_contrib.test_utils.tel.tel_test_utils import get_call_uri
-from acts_contrib.test_utils.tel.tel_test_utils import get_phone_number
-from acts_contrib.test_utils.tel.tel_test_utils import hangup_call
-from acts_contrib.test_utils.tel.tel_test_utils import is_uri_equivalent
-from acts_contrib.test_utils.tel.tel_test_utils import multithread_func
-from acts_contrib.test_utils.tel.tel_test_utils import num_active_calls
-from acts_contrib.test_utils.tel.tel_test_utils import verify_incall_state
-from acts_contrib.test_utils.tel.tel_test_utils import wait_and_answer_call
-from acts_contrib.test_utils.tel.tel_test_utils import get_capability_for_subscription
-from acts_contrib.test_utils.tel.tel_test_utils import ensure_phones_idle
-from acts_contrib.test_utils.tel.tel_voice_utils import get_cep_conference_call_id
-from acts_contrib.test_utils.tel.tel_voice_utils import is_phone_in_call_1x
-from acts_contrib.test_utils.tel.tel_voice_utils import is_phone_in_call_2g
-from acts_contrib.test_utils.tel.tel_voice_utils import is_phone_in_call_3g
-from acts_contrib.test_utils.tel.tel_voice_utils import is_phone_in_call_csfb
-from acts_contrib.test_utils.tel.tel_voice_utils import is_phone_in_call_iwlan
-from acts_contrib.test_utils.tel.tel_voice_utils import is_phone_in_call_volte
-from acts_contrib.test_utils.tel.tel_voice_utils import is_phone_in_call_wcdma
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_3g
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_voice_2g
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_voice_3g
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_csfb
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_iwlan
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_voice_general
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_volte
-from acts_contrib.test_utils.tel.tel_voice_utils import swap_calls
-from acts_contrib.test_utils.tel.tel_voice_utils import three_phone_call_forwarding_short_seq
-from acts_contrib.test_utils.tel.tel_voice_utils import three_phone_call_waiting_short_seq
+from acts.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
+from acts.test_utils.tel.tel_defines import CALL_CAPABILITY_MANAGE_CONFERENCE
+from acts.test_utils.tel.tel_defines import CALL_CAPABILITY_MERGE_CONFERENCE
+from acts.test_utils.tel.tel_defines import CALL_CAPABILITY_SWAP_CONFERENCE
+from acts.test_utils.tel.tel_defines import CALL_PROPERTY_CONFERENCE
+from acts.test_utils.tel.tel_defines import CALL_STATE_ACTIVE
+from acts.test_utils.tel.tel_defines import CALL_STATE_HOLDING
+from acts.test_utils.tel.tel_defines import CAPABILITY_CONFERENCE
+from acts.test_utils.tel.tel_defines import PHONE_TYPE_CDMA
+from acts.test_utils.tel.tel_defines import PHONE_TYPE_GSM
+from acts.test_utils.tel.tel_defines import WAIT_TIME_IN_CALL
+from acts.test_utils.tel.tel_defines import WFC_MODE_WIFI_ONLY
+from acts.test_utils.tel.tel_defines import WFC_MODE_WIFI_PREFERRED
+from acts.test_utils.tel.tel_subscription_utils import get_outgoing_voice_sub_id
+from acts.test_utils.tel.tel_test_utils import call_reject
+from acts.test_utils.tel.tel_test_utils import call_setup_teardown
+from acts.test_utils.tel.tel_test_utils import get_call_uri
+from acts.test_utils.tel.tel_test_utils import get_phone_number
+from acts.test_utils.tel.tel_test_utils import hangup_call
+from acts.test_utils.tel.tel_test_utils import is_uri_equivalent
+from acts.test_utils.tel.tel_test_utils import multithread_func
+from acts.test_utils.tel.tel_test_utils import num_active_calls
+from acts.test_utils.tel.tel_test_utils import verify_incall_state
+from acts.test_utils.tel.tel_test_utils import wait_and_answer_call
+from acts.test_utils.tel.tel_test_utils import get_capability_for_subscription
+from acts.test_utils.tel.tel_test_utils import ensure_phones_idle
+from acts.test_utils.tel.tel_voice_utils import get_cep_conference_call_id
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_1x
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_2g
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_3g
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_csfb
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_iwlan
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_volte
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_wcdma
+from acts.test_utils.tel.tel_voice_utils import phone_setup_3g
+from acts.test_utils.tel.tel_voice_utils import phone_setup_voice_2g
+from acts.test_utils.tel.tel_voice_utils import phone_setup_voice_3g
+from acts.test_utils.tel.tel_voice_utils import phone_setup_csfb
+from acts.test_utils.tel.tel_voice_utils import phone_setup_iwlan
+from acts.test_utils.tel.tel_voice_utils import phone_setup_voice_general
+from acts.test_utils.tel.tel_voice_utils import phone_setup_volte
+from acts.test_utils.tel.tel_voice_utils import swap_calls
+from acts.test_utils.tel.tel_voice_utils import three_phone_call_forwarding_short_seq
+from acts.test_utils.tel.tel_voice_utils import three_phone_call_waiting_short_seq
class TelLiveVoiceConfTest(TelephonyBaseTest):
diff --git a/acts_tests/tests/google/tel/live/TelLiveVoiceTest.py b/acts_tests/tests/google/tel/live/TelLiveVoiceTest.py
index a129398..94d9146 100644
--- a/acts_tests/tests/google/tel/live/TelLiveVoiceTest.py
+++ b/acts_tests/tests/google/tel/live/TelLiveVoiceTest.py
@@ -21,83 +21,83 @@
from acts import signals
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.tel.loggers.protos.telephony_metric_pb2 import TelephonyVoiceTestResult
-from acts_contrib.test_utils.tel.loggers.telephony_metric_logger import TelephonyMetricLogger
-from acts_contrib.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
-from acts_contrib.test_utils.tel.tel_data_utils import wifi_cell_switching
-from acts_contrib.test_utils.tel.tel_defines import DIRECTION_MOBILE_ORIGINATED
-from acts_contrib.test_utils.tel.tel_defines import DIRECTION_MOBILE_TERMINATED
-from acts_contrib.test_utils.tel.tel_defines import GEN_2G
-from acts_contrib.test_utils.tel.tel_defines import GEN_4G
-from acts_contrib.test_utils.tel.tel_defines import CALL_STATE_ACTIVE
-from acts_contrib.test_utils.tel.tel_defines import CALL_STATE_HOLDING
-from acts_contrib.test_utils.tel.tel_defines import GEN_3G
-from acts_contrib.test_utils.tel.tel_defines import MAX_WAIT_TIME_NW_SELECTION
-from acts_contrib.test_utils.tel.tel_defines import NETWORK_SERVICE_DATA
-from acts_contrib.test_utils.tel.tel_defines import PHONE_TYPE_CDMA
-from acts_contrib.test_utils.tel.tel_defines import PHONE_TYPE_GSM
-from acts_contrib.test_utils.tel.tel_defines import WAIT_TIME_IN_CALL
-from acts_contrib.test_utils.tel.tel_defines import WAIT_TIME_IN_CALL_FOR_IMS
-from acts_contrib.test_utils.tel.tel_defines import WAIT_TIME_ANDROID_STATE_SETTLING
-from acts_contrib.test_utils.tel.tel_defines import WFC_MODE_CELLULAR_PREFERRED
-from acts_contrib.test_utils.tel.tel_defines import WFC_MODE_WIFI_ONLY
-from acts_contrib.test_utils.tel.tel_defines import WFC_MODE_WIFI_PREFERRED
-from acts_contrib.test_utils.tel.tel_subscription_utils import \
+from acts.test_utils.tel.loggers.protos.telephony_metric_pb2 import TelephonyVoiceTestResult
+from acts.test_utils.tel.loggers.telephony_metric_logger import TelephonyMetricLogger
+from acts.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
+from acts.test_utils.tel.tel_data_utils import wifi_cell_switching
+from acts.test_utils.tel.tel_defines import DIRECTION_MOBILE_ORIGINATED
+from acts.test_utils.tel.tel_defines import DIRECTION_MOBILE_TERMINATED
+from acts.test_utils.tel.tel_defines import GEN_2G
+from acts.test_utils.tel.tel_defines import GEN_4G
+from acts.test_utils.tel.tel_defines import CALL_STATE_ACTIVE
+from acts.test_utils.tel.tel_defines import CALL_STATE_HOLDING
+from acts.test_utils.tel.tel_defines import GEN_3G
+from acts.test_utils.tel.tel_defines import MAX_WAIT_TIME_NW_SELECTION
+from acts.test_utils.tel.tel_defines import NETWORK_SERVICE_DATA
+from acts.test_utils.tel.tel_defines import PHONE_TYPE_CDMA
+from acts.test_utils.tel.tel_defines import PHONE_TYPE_GSM
+from acts.test_utils.tel.tel_defines import WAIT_TIME_IN_CALL
+from acts.test_utils.tel.tel_defines import WAIT_TIME_IN_CALL_FOR_IMS
+from acts.test_utils.tel.tel_defines import WAIT_TIME_ANDROID_STATE_SETTLING
+from acts.test_utils.tel.tel_defines import WFC_MODE_CELLULAR_PREFERRED
+from acts.test_utils.tel.tel_defines import WFC_MODE_WIFI_ONLY
+from acts.test_utils.tel.tel_defines import WFC_MODE_WIFI_PREFERRED
+from acts.test_utils.tel.tel_subscription_utils import \
get_incoming_voice_sub_id
-from acts_contrib.test_utils.tel.tel_subscription_utils import \
+from acts.test_utils.tel.tel_subscription_utils import \
get_outgoing_voice_sub_id
-from acts_contrib.test_utils.tel.tel_test_utils import call_setup_teardown
-from acts_contrib.test_utils.tel.tel_test_utils import \
+from acts.test_utils.tel.tel_test_utils import call_setup_teardown
+from acts.test_utils.tel.tel_test_utils import \
call_voicemail_erase_all_pending_voicemail
-from acts_contrib.test_utils.tel.tel_test_utils import active_file_download_task
+from acts.test_utils.tel.tel_test_utils import active_file_download_task
from acts.utils import adb_shell_ping
-from acts_contrib.test_utils.tel.tel_test_utils import ensure_phones_default_state
-from acts_contrib.test_utils.tel.tel_test_utils import ensure_network_generation
-from acts_contrib.test_utils.tel.tel_test_utils import get_mobile_data_usage
-from acts_contrib.test_utils.tel.tel_test_utils import hangup_call
-from acts_contrib.test_utils.tel.tel_test_utils import initiate_call
-from acts_contrib.test_utils.tel.tel_test_utils import is_phone_in_call_active
-from acts_contrib.test_utils.tel.tel_test_utils import is_phone_in_call
-from acts_contrib.test_utils.tel.tel_test_utils import multithread_func
-from acts_contrib.test_utils.tel.tel_test_utils import num_active_calls
-from acts_contrib.test_utils.tel.tel_test_utils import remove_mobile_data_usage_limit
-from acts_contrib.test_utils.tel.tel_test_utils import run_multithread_func
-from acts_contrib.test_utils.tel.tel_test_utils import set_mobile_data_usage_limit
-from acts_contrib.test_utils.tel.tel_test_utils import verify_internet_connection
-from acts_contrib.test_utils.tel.tel_test_utils import verify_incall_state
-from acts_contrib.test_utils.tel.tel_test_utils import wait_for_cell_data_connection
-from acts_contrib.test_utils.tel.tel_test_utils import wait_for_ringing_call
-from acts_contrib.test_utils.tel.tel_test_utils import wait_for_state
-from acts_contrib.test_utils.tel.tel_test_utils import start_youtube_video
-from acts_contrib.test_utils.tel.tel_test_utils import set_wifi_to_default
-from acts_contrib.test_utils.tel.tel_test_utils import STORY_LINE
-from acts_contrib.test_utils.tel.tel_test_utils import wait_for_in_call_active
-from acts_contrib.test_utils.tel.tel_test_utils import set_preferred_mode_for_5g
-from acts_contrib.test_utils.tel.tel_test_utils import is_current_network_5g_nsa
-from acts_contrib.test_utils.tel.tel_voice_utils import is_phone_in_call_1x
-from acts_contrib.test_utils.tel.tel_voice_utils import is_phone_in_call_2g
-from acts_contrib.test_utils.tel.tel_voice_utils import is_phone_in_call_3g
-from acts_contrib.test_utils.tel.tel_voice_utils import is_phone_in_call_csfb
-from acts_contrib.test_utils.tel.tel_voice_utils import is_phone_in_call_iwlan
-from acts_contrib.test_utils.tel.tel_voice_utils import is_phone_in_call_not_iwlan
-from acts_contrib.test_utils.tel.tel_voice_utils import is_phone_in_call_wcdma
-from acts_contrib.test_utils.tel.tel_voice_utils import is_phone_in_call_volte
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_csfb
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_iwlan
-from acts_contrib.test_utils.tel.tel_voice_utils import \
+from acts.test_utils.tel.tel_test_utils import ensure_phones_default_state
+from acts.test_utils.tel.tel_test_utils import ensure_network_generation
+from acts.test_utils.tel.tel_test_utils import get_mobile_data_usage
+from acts.test_utils.tel.tel_test_utils import hangup_call
+from acts.test_utils.tel.tel_test_utils import initiate_call
+from acts.test_utils.tel.tel_test_utils import is_phone_in_call_active
+from acts.test_utils.tel.tel_test_utils import is_phone_in_call
+from acts.test_utils.tel.tel_test_utils import multithread_func
+from acts.test_utils.tel.tel_test_utils import num_active_calls
+from acts.test_utils.tel.tel_test_utils import remove_mobile_data_usage_limit
+from acts.test_utils.tel.tel_test_utils import run_multithread_func
+from acts.test_utils.tel.tel_test_utils import set_mobile_data_usage_limit
+from acts.test_utils.tel.tel_test_utils import verify_internet_connection
+from acts.test_utils.tel.tel_test_utils import verify_incall_state
+from acts.test_utils.tel.tel_test_utils import wait_for_cell_data_connection
+from acts.test_utils.tel.tel_test_utils import wait_for_ringing_call
+from acts.test_utils.tel.tel_test_utils import wait_for_state
+from acts.test_utils.tel.tel_test_utils import start_youtube_video
+from acts.test_utils.tel.tel_test_utils import set_wifi_to_default
+from acts.test_utils.tel.tel_test_utils import STORY_LINE
+from acts.test_utils.tel.tel_test_utils import wait_for_in_call_active
+from acts.test_utils.tel.tel_test_utils import set_preferred_mode_for_5g
+from acts.test_utils.tel.tel_test_utils import is_current_network_5g_nsa
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_1x
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_2g
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_3g
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_csfb
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_iwlan
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_not_iwlan
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_wcdma
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_volte
+from acts.test_utils.tel.tel_voice_utils import phone_setup_csfb
+from acts.test_utils.tel.tel_voice_utils import phone_setup_iwlan
+from acts.test_utils.tel.tel_voice_utils import \
phone_setup_iwlan_cellular_preferred
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_voice_2g
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_voice_3g
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_voice_general
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_volte
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_idle_2g
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_idle_3g
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_idle_csfb
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_idle_iwlan
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_idle_volte
-from acts_contrib.test_utils.tel.tel_voice_utils import two_phone_call_leave_voice_mail
-from acts_contrib.test_utils.tel.tel_voice_utils import two_phone_call_long_seq
-from acts_contrib.test_utils.tel.tel_voice_utils import two_phone_call_short_seq
+from acts.test_utils.tel.tel_voice_utils import phone_setup_voice_2g
+from acts.test_utils.tel.tel_voice_utils import phone_setup_voice_3g
+from acts.test_utils.tel.tel_voice_utils import phone_setup_voice_general
+from acts.test_utils.tel.tel_voice_utils import phone_setup_volte
+from acts.test_utils.tel.tel_voice_utils import phone_idle_2g
+from acts.test_utils.tel.tel_voice_utils import phone_idle_3g
+from acts.test_utils.tel.tel_voice_utils import phone_idle_csfb
+from acts.test_utils.tel.tel_voice_utils import phone_idle_iwlan
+from acts.test_utils.tel.tel_voice_utils import phone_idle_volte
+from acts.test_utils.tel.tel_voice_utils import two_phone_call_leave_voice_mail
+from acts.test_utils.tel.tel_voice_utils import two_phone_call_long_seq
+from acts.test_utils.tel.tel_voice_utils import two_phone_call_short_seq
DEFAULT_LONG_DURATION_CALL_TOTAL_DURATION = 1 * 60 * 60 # default value 1 hour
DEFAULT_PING_DURATION = 120 # in seconds
diff --git a/acts_tests/tests/google/tel/live/TelWifiDataTest.py b/acts_tests/tests/google/tel/live/TelWifiDataTest.py
index 4672feb..fdc7333 100644
--- a/acts_tests/tests/google/tel/live/TelWifiDataTest.py
+++ b/acts_tests/tests/google/tel/live/TelWifiDataTest.py
@@ -17,24 +17,24 @@
import time
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
-from acts_contrib.test_utils.tel.tel_atten_utils import set_rssi
-from acts_contrib.test_utils.tel.tel_defines import MAX_RSSI_RESERVED_VALUE
-from acts_contrib.test_utils.tel.tel_defines import MIN_RSSI_RESERVED_VALUE
-from acts_contrib.test_utils.tel.tel_defines import MAX_WAIT_TIME_NW_SELECTION
-from acts_contrib.test_utils.tel.tel_defines import NETWORK_SERVICE_DATA
-from acts_contrib.test_utils.tel.tel_defines import GEN_4G
-from acts_contrib.test_utils.tel.tel_test_utils import ensure_network_generation
-from acts_contrib.test_utils.tel.tel_test_utils import ensure_wifi_connected
-from acts_contrib.test_utils.tel.tel_test_utils import toggle_airplane_mode
-from acts_contrib.test_utils.tel.tel_test_utils import verify_internet_connection
-from acts_contrib.test_utils.tel.tel_test_utils import wait_for_cell_data_connection
-from acts_contrib.test_utils.tel.tel_test_utils import wait_for_wifi_data_connection
-from acts_contrib.test_utils.tel.tel_test_utils import run_multithread_func
-from acts_contrib.test_utils.tel.tel_test_utils import active_file_download_test
-from acts_contrib.test_utils.tel.tel_test_utils import get_telephony_signal_strength
-from acts_contrib.test_utils.tel.tel_test_utils import get_wifi_signal_strength
-from acts_contrib.test_utils.tel.tel_test_utils import reboot_device
+from acts.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
+from acts.test_utils.tel.tel_atten_utils import set_rssi
+from acts.test_utils.tel.tel_defines import MAX_RSSI_RESERVED_VALUE
+from acts.test_utils.tel.tel_defines import MIN_RSSI_RESERVED_VALUE
+from acts.test_utils.tel.tel_defines import MAX_WAIT_TIME_NW_SELECTION
+from acts.test_utils.tel.tel_defines import NETWORK_SERVICE_DATA
+from acts.test_utils.tel.tel_defines import GEN_4G
+from acts.test_utils.tel.tel_test_utils import ensure_network_generation
+from acts.test_utils.tel.tel_test_utils import ensure_wifi_connected
+from acts.test_utils.tel.tel_test_utils import toggle_airplane_mode
+from acts.test_utils.tel.tel_test_utils import verify_internet_connection
+from acts.test_utils.tel.tel_test_utils import wait_for_cell_data_connection
+from acts.test_utils.tel.tel_test_utils import wait_for_wifi_data_connection
+from acts.test_utils.tel.tel_test_utils import run_multithread_func
+from acts.test_utils.tel.tel_test_utils import active_file_download_test
+from acts.test_utils.tel.tel_test_utils import get_telephony_signal_strength
+from acts.test_utils.tel.tel_test_utils import get_wifi_signal_strength
+from acts.test_utils.tel.tel_test_utils import reboot_device
from acts.utils import adb_shell_ping
# Attenuator name
diff --git a/acts_tests/tests/google/tel/live/TelWifiVideoTest.py b/acts_tests/tests/google/tel/live/TelWifiVideoTest.py
index 8f32038..360b09c 100644
--- a/acts_tests/tests/google/tel/live/TelWifiVideoTest.py
+++ b/acts_tests/tests/google/tel/live/TelWifiVideoTest.py
@@ -20,56 +20,56 @@
import time
from queue import Empty
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
-from acts_contrib.test_utils.tel.tel_defines import AUDIO_ROUTE_EARPIECE
-from acts_contrib.test_utils.tel.tel_defines import AUDIO_ROUTE_SPEAKER
-from acts_contrib.test_utils.tel.tel_defines import CALL_STATE_ACTIVE
-from acts_contrib.test_utils.tel.tel_defines import CALL_STATE_HOLDING
-from acts_contrib.test_utils.tel.tel_defines import CALL_CAPABILITY_MANAGE_CONFERENCE
-from acts_contrib.test_utils.tel.tel_defines import CALL_CAPABILITY_MERGE_CONFERENCE
-from acts_contrib.test_utils.tel.tel_defines import CALL_CAPABILITY_SWAP_CONFERENCE
-from acts_contrib.test_utils.tel.tel_defines import CALL_PROPERTY_CONFERENCE
-from acts_contrib.test_utils.tel.tel_defines import MAX_WAIT_TIME_VIDEO_SESSION_EVENT
-from acts_contrib.test_utils.tel.tel_defines import MAX_WAIT_TIME_VOLTE_ENABLED
-from acts_contrib.test_utils.tel.tel_defines import VT_STATE_AUDIO_ONLY
-from acts_contrib.test_utils.tel.tel_defines import VT_STATE_BIDIRECTIONAL
-from acts_contrib.test_utils.tel.tel_defines import VT_STATE_BIDIRECTIONAL_PAUSED
-from acts_contrib.test_utils.tel.tel_defines import VT_VIDEO_QUALITY_DEFAULT
-from acts_contrib.test_utils.tel.tel_defines import VT_STATE_RX_ENABLED
-from acts_contrib.test_utils.tel.tel_defines import VT_STATE_TX_ENABLED
-from acts_contrib.test_utils.tel.tel_defines import WAIT_TIME_ANDROID_STATE_SETTLING
-from acts_contrib.test_utils.tel.tel_defines import WAIT_TIME_IN_CALL
-from acts_contrib.test_utils.tel.tel_defines import EVENT_VIDEO_SESSION_EVENT
-from acts_contrib.test_utils.tel.tel_defines import EventTelecomVideoCallSessionEvent
-from acts_contrib.test_utils.tel.tel_defines import SESSION_EVENT_RX_PAUSE
-from acts_contrib.test_utils.tel.tel_defines import SESSION_EVENT_RX_RESUME
-from acts_contrib.test_utils.tel.tel_defines import WFC_MODE_WIFI_PREFERRED
-from acts_contrib.test_utils.tel.tel_test_utils import call_setup_teardown
-from acts_contrib.test_utils.tel.tel_test_utils import disconnect_call_by_id
-from acts_contrib.test_utils.tel.tel_test_utils import hangup_call
-from acts_contrib.test_utils.tel.tel_test_utils import multithread_func
-from acts_contrib.test_utils.tel.tel_test_utils import num_active_calls
-from acts_contrib.test_utils.tel.tel_test_utils import verify_http_connection
-from acts_contrib.test_utils.tel.tel_test_utils import verify_incall_state
-from acts_contrib.test_utils.tel.tel_test_utils import wait_for_video_enabled
-from acts_contrib.test_utils.tel.tel_video_utils import get_call_id_in_video_state
-from acts_contrib.test_utils.tel.tel_video_utils import \
+from acts.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
+from acts.test_utils.tel.tel_defines import AUDIO_ROUTE_EARPIECE
+from acts.test_utils.tel.tel_defines import AUDIO_ROUTE_SPEAKER
+from acts.test_utils.tel.tel_defines import CALL_STATE_ACTIVE
+from acts.test_utils.tel.tel_defines import CALL_STATE_HOLDING
+from acts.test_utils.tel.tel_defines import CALL_CAPABILITY_MANAGE_CONFERENCE
+from acts.test_utils.tel.tel_defines import CALL_CAPABILITY_MERGE_CONFERENCE
+from acts.test_utils.tel.tel_defines import CALL_CAPABILITY_SWAP_CONFERENCE
+from acts.test_utils.tel.tel_defines import CALL_PROPERTY_CONFERENCE
+from acts.test_utils.tel.tel_defines import MAX_WAIT_TIME_VIDEO_SESSION_EVENT
+from acts.test_utils.tel.tel_defines import MAX_WAIT_TIME_VOLTE_ENABLED
+from acts.test_utils.tel.tel_defines import VT_STATE_AUDIO_ONLY
+from acts.test_utils.tel.tel_defines import VT_STATE_BIDIRECTIONAL
+from acts.test_utils.tel.tel_defines import VT_STATE_BIDIRECTIONAL_PAUSED
+from acts.test_utils.tel.tel_defines import VT_VIDEO_QUALITY_DEFAULT
+from acts.test_utils.tel.tel_defines import VT_STATE_RX_ENABLED
+from acts.test_utils.tel.tel_defines import VT_STATE_TX_ENABLED
+from acts.test_utils.tel.tel_defines import WAIT_TIME_ANDROID_STATE_SETTLING
+from acts.test_utils.tel.tel_defines import WAIT_TIME_IN_CALL
+from acts.test_utils.tel.tel_defines import EVENT_VIDEO_SESSION_EVENT
+from acts.test_utils.tel.tel_defines import EventTelecomVideoCallSessionEvent
+from acts.test_utils.tel.tel_defines import SESSION_EVENT_RX_PAUSE
+from acts.test_utils.tel.tel_defines import SESSION_EVENT_RX_RESUME
+from acts.test_utils.tel.tel_defines import WFC_MODE_WIFI_PREFERRED
+from acts.test_utils.tel.tel_test_utils import call_setup_teardown
+from acts.test_utils.tel.tel_test_utils import disconnect_call_by_id
+from acts.test_utils.tel.tel_test_utils import hangup_call
+from acts.test_utils.tel.tel_test_utils import multithread_func
+from acts.test_utils.tel.tel_test_utils import num_active_calls
+from acts.test_utils.tel.tel_test_utils import verify_http_connection
+from acts.test_utils.tel.tel_test_utils import verify_incall_state
+from acts.test_utils.tel.tel_test_utils import wait_for_video_enabled
+from acts.test_utils.tel.tel_video_utils import get_call_id_in_video_state
+from acts.test_utils.tel.tel_video_utils import \
is_phone_in_call_video_bidirectional
-from acts_contrib.test_utils.tel.tel_video_utils import \
+from acts.test_utils.tel.tel_video_utils import \
is_phone_in_call_viwifi_bidirectional
-from acts_contrib.test_utils.tel.tel_video_utils import is_phone_in_call_voice_hd
-from acts_contrib.test_utils.tel.tel_video_utils import phone_setup_video
-from acts_contrib.test_utils.tel.tel_video_utils import \
+from acts.test_utils.tel.tel_video_utils import is_phone_in_call_voice_hd
+from acts.test_utils.tel.tel_video_utils import phone_setup_video
+from acts.test_utils.tel.tel_video_utils import \
verify_video_call_in_expected_state
-from acts_contrib.test_utils.tel.tel_video_utils import video_call_downgrade
-from acts_contrib.test_utils.tel.tel_video_utils import video_call_modify_video
-from acts_contrib.test_utils.tel.tel_video_utils import video_call_setup_teardown
-from acts_contrib.test_utils.tel.tel_voice_utils import get_audio_route
-from acts_contrib.test_utils.tel.tel_voice_utils import is_phone_in_call_volte
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_volte
-from acts_contrib.test_utils.tel.tel_voice_utils import set_audio_route
-from acts_contrib.test_utils.tel.tel_voice_utils import get_cep_conference_call_id
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_iwlan
+from acts.test_utils.tel.tel_video_utils import video_call_downgrade
+from acts.test_utils.tel.tel_video_utils import video_call_modify_video
+from acts.test_utils.tel.tel_video_utils import video_call_setup_teardown
+from acts.test_utils.tel.tel_voice_utils import get_audio_route
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_volte
+from acts.test_utils.tel.tel_voice_utils import phone_setup_volte
+from acts.test_utils.tel.tel_voice_utils import set_audio_route
+from acts.test_utils.tel.tel_voice_utils import get_cep_conference_call_id
+from acts.test_utils.tel.tel_voice_utils import phone_setup_iwlan
DEFAULT_LONG_DURATION_CALL_TOTAL_DURATION = 1 * 60 * 60 # default 1 hour
diff --git a/acts_tests/tests/google/tel/live/TelWifiVoiceTest.py b/acts_tests/tests/google/tel/live/TelWifiVoiceTest.py
index 1b177836..9d0e4c5 100644
--- a/acts_tests/tests/google/tel/live/TelWifiVoiceTest.py
+++ b/acts_tests/tests/google/tel/live/TelWifiVoiceTest.py
@@ -20,75 +20,75 @@
import time
from queue import Empty
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
-from acts_contrib.test_utils.tel.tel_atten_utils import set_rssi
-from acts_contrib.test_utils.tel.tel_defines import CELL_STRONG_RSSI_VALUE
-from acts_contrib.test_utils.tel.tel_defines import CELL_WEAK_RSSI_VALUE
-from acts_contrib.test_utils.tel.tel_defines import DIRECTION_MOBILE_ORIGINATED
-from acts_contrib.test_utils.tel.tel_defines import DIRECTION_MOBILE_TERMINATED
-from acts_contrib.test_utils.tel.tel_defines import GEN_3G
-from acts_contrib.test_utils.tel.tel_defines import GEN_4G
-from acts_contrib.test_utils.tel.tel_defines import INVALID_WIFI_RSSI
-from acts_contrib.test_utils.tel.tel_defines import MAX_WAIT_TIME_CALL_DROP
-from acts_contrib.test_utils.tel.tel_defines import MAX_WAIT_TIME_NW_SELECTION
-from acts_contrib.test_utils.tel.tel_defines import MAX_RSSI_RESERVED_VALUE
-from acts_contrib.test_utils.tel.tel_defines import MIN_RSSI_RESERVED_VALUE
-from acts_contrib.test_utils.tel.tel_defines import NETWORK_SERVICE_DATA
-from acts_contrib.test_utils.tel.tel_defines import NETWORK_SERVICE_VOICE
-from acts_contrib.test_utils.tel.tel_defines import PRECISE_CALL_STATE_LISTEN_LEVEL_BACKGROUND
-from acts_contrib.test_utils.tel.tel_defines import PRECISE_CALL_STATE_LISTEN_LEVEL_FOREGROUND
-from acts_contrib.test_utils.tel.tel_defines import PRECISE_CALL_STATE_LISTEN_LEVEL_RINGING
-from acts_contrib.test_utils.tel.tel_defines import RAT_LTE
-from acts_contrib.test_utils.tel.tel_defines import RAT_IWLAN
-from acts_contrib.test_utils.tel.tel_defines import RAT_WCDMA
-from acts_contrib.test_utils.tel.tel_defines import WAIT_TIME_BETWEEN_REG_AND_CALL
-from acts_contrib.test_utils.tel.tel_defines import WAIT_TIME_IN_CALL
-from acts_contrib.test_utils.tel.tel_defines import WAIT_TIME_WIFI_RSSI_CALIBRATION_SCREEN_ON
-from acts_contrib.test_utils.tel.tel_defines import WAIT_TIME_WIFI_RSSI_CALIBRATION_WIFI_CONNECTED
-from acts_contrib.test_utils.tel.tel_defines import WFC_MODE_CELLULAR_PREFERRED
-from acts_contrib.test_utils.tel.tel_defines import WFC_MODE_DISABLED
-from acts_contrib.test_utils.tel.tel_defines import WFC_MODE_WIFI_ONLY
-from acts_contrib.test_utils.tel.tel_defines import WFC_MODE_WIFI_PREFERRED
-from acts_contrib.test_utils.tel.tel_defines import WIFI_WEAK_RSSI_VALUE
-from acts_contrib.test_utils.tel.tel_defines import EventNetworkCallback
-from acts_contrib.test_utils.tel.tel_defines import NetworkCallbackAvailable
-from acts_contrib.test_utils.tel.tel_defines import NetworkCallbackLost
-from acts_contrib.test_utils.tel.tel_defines import SignalStrengthContainer
-from acts_contrib.test_utils.tel.tel_test_utils import wifi_toggle_state
-from acts_contrib.test_utils.tel.tel_test_utils import ensure_network_generation
-from acts_contrib.test_utils.tel.tel_test_utils import ensure_phones_default_state
-from acts_contrib.test_utils.tel.tel_test_utils import ensure_wifi_connected
-from acts_contrib.test_utils.tel.tel_test_utils import get_network_rat
-from acts_contrib.test_utils.tel.tel_test_utils import get_phone_number
-from acts_contrib.test_utils.tel.tel_test_utils import hangup_call
-from acts_contrib.test_utils.tel.tel_test_utils import initiate_call
-from acts_contrib.test_utils.tel.tel_test_utils import is_network_call_back_event_match
-from acts_contrib.test_utils.tel.tel_test_utils import is_phone_in_call
-from acts_contrib.test_utils.tel.tel_test_utils import is_phone_not_in_call
-from acts_contrib.test_utils.tel.tel_test_utils import set_wfc_mode
-from acts_contrib.test_utils.tel.tel_test_utils import toggle_airplane_mode
-from acts_contrib.test_utils.tel.tel_test_utils import toggle_volte
-from acts_contrib.test_utils.tel.tel_test_utils import wait_and_answer_call
-from acts_contrib.test_utils.tel.tel_test_utils import wait_for_cell_data_connection
-from acts_contrib.test_utils.tel.tel_test_utils import wait_for_droid_not_in_call
-from acts_contrib.test_utils.tel.tel_test_utils import wait_for_wfc_disabled
-from acts_contrib.test_utils.tel.tel_test_utils import wait_for_wfc_enabled
-from acts_contrib.test_utils.tel.tel_test_utils import wait_for_wifi_data_connection
-from acts_contrib.test_utils.tel.tel_test_utils import verify_http_connection
-from acts_contrib.test_utils.tel.tel_test_utils import get_telephony_signal_strength
-from acts_contrib.test_utils.tel.tel_test_utils import get_wifi_signal_strength
-from acts_contrib.test_utils.tel.tel_test_utils import wait_for_state
-from acts_contrib.test_utils.tel.tel_voice_utils import is_phone_in_call_3g
-from acts_contrib.test_utils.tel.tel_voice_utils import is_phone_in_call_csfb
-from acts_contrib.test_utils.tel.tel_voice_utils import is_phone_in_call_iwlan
-from acts_contrib.test_utils.tel.tel_voice_utils import is_phone_in_call_not_iwlan
-from acts_contrib.test_utils.tel.tel_voice_utils import is_phone_in_call_volte
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_voice_general
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_idle_3g
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_idle_csfb
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_idle_iwlan
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_idle_not_iwlan
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_idle_volte
+from acts.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
+from acts.test_utils.tel.tel_atten_utils import set_rssi
+from acts.test_utils.tel.tel_defines import CELL_STRONG_RSSI_VALUE
+from acts.test_utils.tel.tel_defines import CELL_WEAK_RSSI_VALUE
+from acts.test_utils.tel.tel_defines import DIRECTION_MOBILE_ORIGINATED
+from acts.test_utils.tel.tel_defines import DIRECTION_MOBILE_TERMINATED
+from acts.test_utils.tel.tel_defines import GEN_3G
+from acts.test_utils.tel.tel_defines import GEN_4G
+from acts.test_utils.tel.tel_defines import INVALID_WIFI_RSSI
+from acts.test_utils.tel.tel_defines import MAX_WAIT_TIME_CALL_DROP
+from acts.test_utils.tel.tel_defines import MAX_WAIT_TIME_NW_SELECTION
+from acts.test_utils.tel.tel_defines import MAX_RSSI_RESERVED_VALUE
+from acts.test_utils.tel.tel_defines import MIN_RSSI_RESERVED_VALUE
+from acts.test_utils.tel.tel_defines import NETWORK_SERVICE_DATA
+from acts.test_utils.tel.tel_defines import NETWORK_SERVICE_VOICE
+from acts.test_utils.tel.tel_defines import PRECISE_CALL_STATE_LISTEN_LEVEL_BACKGROUND
+from acts.test_utils.tel.tel_defines import PRECISE_CALL_STATE_LISTEN_LEVEL_FOREGROUND
+from acts.test_utils.tel.tel_defines import PRECISE_CALL_STATE_LISTEN_LEVEL_RINGING
+from acts.test_utils.tel.tel_defines import RAT_LTE
+from acts.test_utils.tel.tel_defines import RAT_IWLAN
+from acts.test_utils.tel.tel_defines import RAT_WCDMA
+from acts.test_utils.tel.tel_defines import WAIT_TIME_BETWEEN_REG_AND_CALL
+from acts.test_utils.tel.tel_defines import WAIT_TIME_IN_CALL
+from acts.test_utils.tel.tel_defines import WAIT_TIME_WIFI_RSSI_CALIBRATION_SCREEN_ON
+from acts.test_utils.tel.tel_defines import WAIT_TIME_WIFI_RSSI_CALIBRATION_WIFI_CONNECTED
+from acts.test_utils.tel.tel_defines import WFC_MODE_CELLULAR_PREFERRED
+from acts.test_utils.tel.tel_defines import WFC_MODE_DISABLED
+from acts.test_utils.tel.tel_defines import WFC_MODE_WIFI_ONLY
+from acts.test_utils.tel.tel_defines import WFC_MODE_WIFI_PREFERRED
+from acts.test_utils.tel.tel_defines import WIFI_WEAK_RSSI_VALUE
+from acts.test_utils.tel.tel_defines import EventNetworkCallback
+from acts.test_utils.tel.tel_defines import NetworkCallbackAvailable
+from acts.test_utils.tel.tel_defines import NetworkCallbackLost
+from acts.test_utils.tel.tel_defines import SignalStrengthContainer
+from acts.test_utils.tel.tel_test_utils import wifi_toggle_state
+from acts.test_utils.tel.tel_test_utils import ensure_network_generation
+from acts.test_utils.tel.tel_test_utils import ensure_phones_default_state
+from acts.test_utils.tel.tel_test_utils import ensure_wifi_connected
+from acts.test_utils.tel.tel_test_utils import get_network_rat
+from acts.test_utils.tel.tel_test_utils import get_phone_number
+from acts.test_utils.tel.tel_test_utils import hangup_call
+from acts.test_utils.tel.tel_test_utils import initiate_call
+from acts.test_utils.tel.tel_test_utils import is_network_call_back_event_match
+from acts.test_utils.tel.tel_test_utils import is_phone_in_call
+from acts.test_utils.tel.tel_test_utils import is_phone_not_in_call
+from acts.test_utils.tel.tel_test_utils import set_wfc_mode
+from acts.test_utils.tel.tel_test_utils import toggle_airplane_mode
+from acts.test_utils.tel.tel_test_utils import toggle_volte
+from acts.test_utils.tel.tel_test_utils import wait_and_answer_call
+from acts.test_utils.tel.tel_test_utils import wait_for_cell_data_connection
+from acts.test_utils.tel.tel_test_utils import wait_for_droid_not_in_call
+from acts.test_utils.tel.tel_test_utils import wait_for_wfc_disabled
+from acts.test_utils.tel.tel_test_utils import wait_for_wfc_enabled
+from acts.test_utils.tel.tel_test_utils import wait_for_wifi_data_connection
+from acts.test_utils.tel.tel_test_utils import verify_http_connection
+from acts.test_utils.tel.tel_test_utils import get_telephony_signal_strength
+from acts.test_utils.tel.tel_test_utils import get_wifi_signal_strength
+from acts.test_utils.tel.tel_test_utils import wait_for_state
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_3g
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_csfb
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_iwlan
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_not_iwlan
+from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_volte
+from acts.test_utils.tel.tel_voice_utils import phone_setup_voice_general
+from acts.test_utils.tel.tel_voice_utils import phone_idle_3g
+from acts.test_utils.tel.tel_voice_utils import phone_idle_csfb
+from acts.test_utils.tel.tel_voice_utils import phone_idle_iwlan
+from acts.test_utils.tel.tel_voice_utils import phone_idle_not_iwlan
+from acts.test_utils.tel.tel_voice_utils import phone_idle_volte
# Attenuator name
ATTEN_NAME_FOR_WIFI_2G = 'wifi0'
diff --git a/acts_tests/tests/google/tel/live/msim/TelLiveMSIMSmsTest.py b/acts_tests/tests/google/tel/live/msim/TelLiveMSIMSmsTest.py
index ad6e713..336ae01 100644
--- a/acts_tests/tests/google/tel/live/msim/TelLiveMSIMSmsTest.py
+++ b/acts_tests/tests/google/tel/live/msim/TelLiveMSIMSmsTest.py
@@ -15,16 +15,16 @@
# limitations under the License.
import time
-from acts_contrib.test_utils.tel.tel_test_utils \
+from acts.test_utils.tel.tel_test_utils \
import sms_send_receive_verify, multithread_func
from acts.utils import rand_ascii_str
-from acts_contrib.test_utils.tel.tel_subscription_utils \
+from acts.test_utils.tel.tel_subscription_utils \
import get_subid_from_slot_index, set_subid_for_message
-from acts_contrib.test_utils.tel.tel_defines \
+from acts.test_utils.tel.tel_defines \
import MULTI_SIM_CONFIG, WAIT_TIME_ANDROID_STATE_SETTLING
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
-from acts_contrib.test_utils.tel.tel_voice_utils \
+from acts.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
+from acts.test_utils.tel.tel_voice_utils \
import phone_setup_voice_general_for_slot
diff --git a/acts_tests/tests/google/tel/live/msim/TelLiveMSIMVoiceTest.py b/acts_tests/tests/google/tel/live/msim/TelLiveMSIMVoiceTest.py
index 501b0d6..f4cb7ca 100644
--- a/acts_tests/tests/google/tel/live/msim/TelLiveMSIMVoiceTest.py
+++ b/acts_tests/tests/google/tel/live/msim/TelLiveMSIMVoiceTest.py
@@ -14,12 +14,12 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-from acts_contrib.test_utils.tel.tel_voice_utils \
+from acts.test_utils.tel.tel_voice_utils \
import two_phone_call_msim_short_seq, phone_setup_voice_general_for_slot
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
-from acts_contrib.test_utils.tel.tel_test_utils import multithread_func
-from acts_contrib.test_utils.tel.tel_defines import MULTI_SIM_CONFIG
+from acts.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
+from acts.test_utils.tel.tel_test_utils import multithread_func
+from acts.test_utils.tel.tel_defines import MULTI_SIM_CONFIG
class TelLiveMSIMVoiceTest(TelephonyBaseTest):
diff --git a/acts_tests/tests/google/usb/UsbTetheringFunctionsTest.py b/acts_tests/tests/google/usb/UsbTetheringFunctionsTest.py
index 14eb381..3f0393b 100644
--- a/acts_tests/tests/google/usb/UsbTetheringFunctionsTest.py
+++ b/acts_tests/tests/google/usb/UsbTetheringFunctionsTest.py
@@ -23,11 +23,11 @@
from acts.libs.proc import job
from acts import signals
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.wifi import wifi_test_utils as wutils
-from acts_contrib.test_utils.tel import tel_test_utils as tutils
-from acts_contrib.test_utils.tel import tel_defines
-from acts_contrib.test_utils.tel.anritsu_utils import wait_for_sms_sent_success
-from acts_contrib.test_utils.tel.tel_defines import EventMmsSentSuccess
+from acts.test_utils.wifi import wifi_test_utils as wutils
+from acts.test_utils.tel import tel_test_utils as tutils
+from acts.test_utils.tel import tel_defines
+from acts.test_utils.tel.anritsu_utils import wait_for_sms_sent_success
+from acts.test_utils.tel.tel_defines import EventMmsSentSuccess
# Time it takes for the usb tethering IP to
# show up in ifconfig and function waiting.
diff --git a/acts_tests/tests/google/wifi/WifiAutoJoinTest.py b/acts_tests/tests/google/wifi/WifiAutoJoinTest.py
index 2fde995..829fc6c 100755
--- a/acts_tests/tests/google/wifi/WifiAutoJoinTest.py
+++ b/acts_tests/tests/google/wifi/WifiAutoJoinTest.py
@@ -18,8 +18,8 @@
from acts import asserts
from acts import base_test
-from acts_contrib.test_utils.wifi import wifi_constants
-from acts_contrib.test_utils.wifi import wifi_test_utils as wutils
+from acts.test_utils.wifi import wifi_constants
+from acts.test_utils.wifi import wifi_test_utils as wutils
WifiEnums = wutils.WifiEnums
NETWORK_ID_ERROR = "Network don't have ID"
diff --git a/acts_tests/tests/google/wifi/WifiAutoUpdateTest.py b/acts_tests/tests/google/wifi/WifiAutoUpdateTest.py
index 3305a9a..ae69271 100755
--- a/acts_tests/tests/google/wifi/WifiAutoUpdateTest.py
+++ b/acts_tests/tests/google/wifi/WifiAutoUpdateTest.py
@@ -20,9 +20,9 @@
from acts.libs.ota import ota_updater
import acts.signals as signals
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.tel.tel_test_utils import WIFI_CONFIG_APBAND_5G
-import acts_contrib.test_utils.wifi.wifi_test_utils as wutils
-from acts_contrib.test_utils.wifi.WifiBaseTest import WifiBaseTest
+from acts.test_utils.tel.tel_test_utils import WIFI_CONFIG_APBAND_5G
+import acts.test_utils.wifi.wifi_test_utils as wutils
+from acts.test_utils.wifi.WifiBaseTest import WifiBaseTest
import acts.utils as utils
WifiEnums = wutils.WifiEnums
diff --git a/acts_tests/tests/google/wifi/WifiChannelSwitchStressTest.py b/acts_tests/tests/google/wifi/WifiChannelSwitchStressTest.py
index e957f59..bdba6e1 100644
--- a/acts_tests/tests/google/wifi/WifiChannelSwitchStressTest.py
+++ b/acts_tests/tests/google/wifi/WifiChannelSwitchStressTest.py
@@ -18,12 +18,12 @@
import random
import re
import logging
-import acts_contrib.test_utils.wifi.wifi_test_utils as wutils
-import acts_contrib.test_utils.tel.tel_test_utils as tel_utils
+import acts.test_utils.wifi.wifi_test_utils as wutils
+import acts.test_utils.tel.tel_test_utils as tel_utils
import acts.utils as utils
from acts import asserts
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.wifi.WifiBaseTest import WifiBaseTest
+from acts.test_utils.wifi.WifiBaseTest import WifiBaseTest
from acts import signals
from acts.controllers import packet_capture
from acts.controllers.ap_lib.hostapd_constants import BAND_2G
diff --git a/acts_tests/tests/google/wifi/WifiChaosTest.py b/acts_tests/tests/google/wifi/WifiChaosTest.py
index 1056dd6..77a83ec 100755
--- a/acts_tests/tests/google/wifi/WifiChaosTest.py
+++ b/acts_tests/tests/google/wifi/WifiChaosTest.py
@@ -21,15 +21,15 @@
import acts.controllers.packet_capture as packet_capture
import acts.signals as signals
-import acts_contrib.test_utils.wifi.rpm_controller_utils as rutils
-import acts_contrib.test_utils.wifi.wifi_datastore_utils as dutils
-import acts_contrib.test_utils.wifi.wifi_test_utils as wutils
+import acts.test_utils.wifi.rpm_controller_utils as rutils
+import acts.test_utils.wifi.wifi_datastore_utils as dutils
+import acts.test_utils.wifi.wifi_test_utils as wutils
from acts import asserts
from acts.base_test import BaseTestClass
from acts.controllers.ap_lib import hostapd_constants
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.wifi.WifiBaseTest import WifiBaseTest
+from acts.test_utils.wifi.WifiBaseTest import WifiBaseTest
WifiEnums = wutils.WifiEnums
diff --git a/acts_tests/tests/google/wifi/WifiConnectedMacRandomizationTest.py b/acts_tests/tests/google/wifi/WifiConnectedMacRandomizationTest.py
index 8165c72..14eafab 100644
--- a/acts_tests/tests/google/wifi/WifiConnectedMacRandomizationTest.py
+++ b/acts_tests/tests/google/wifi/WifiConnectedMacRandomizationTest.py
@@ -21,13 +21,13 @@
import acts.base_test
import acts.signals as signals
-from acts_contrib.test_utils.tel.tel_test_utils import WIFI_CONFIG_APBAND_2G
-import acts_contrib.test_utils.wifi.wifi_test_utils as wutils
+from acts.test_utils.tel.tel_test_utils import WIFI_CONFIG_APBAND_2G
+import acts.test_utils.wifi.wifi_test_utils as wutils
import acts.utils as utils
from acts import asserts
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.wifi.WifiBaseTest import WifiBaseTest
+from acts.test_utils.wifi.WifiBaseTest import WifiBaseTest
WifiEnums = wutils.WifiEnums
# Default timeout used for reboot, toggle WiFi and Airplane mode,
diff --git a/acts_tests/tests/google/wifi/WifiCrashStressTest.py b/acts_tests/tests/google/wifi/WifiCrashStressTest.py
index b44829d..503583c 100644
--- a/acts_tests/tests/google/wifi/WifiCrashStressTest.py
+++ b/acts_tests/tests/google/wifi/WifiCrashStressTest.py
@@ -16,12 +16,12 @@
import time
import acts.signals as signals
-import acts_contrib.test_utils.wifi.wifi_test_utils as wutils
+import acts.test_utils.wifi.wifi_test_utils as wutils
from acts import asserts
from acts import utils
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.wifi.WifiBaseTest import WifiBaseTest
-from acts_contrib.test_utils.tel.tel_test_utils import disable_qxdm_logger
+from acts.test_utils.wifi.WifiBaseTest import WifiBaseTest
+from acts.test_utils.tel.tel_test_utils import disable_qxdm_logger
WifiEnums = wutils.WifiEnums
diff --git a/acts_tests/tests/google/wifi/WifiCrashTest.py b/acts_tests/tests/google/wifi/WifiCrashTest.py
index f6767bc..7f2ad68 100644
--- a/acts_tests/tests/google/wifi/WifiCrashTest.py
+++ b/acts_tests/tests/google/wifi/WifiCrashTest.py
@@ -21,12 +21,12 @@
import acts.base_test
import acts.signals as signals
-import acts_contrib.test_utils.wifi.wifi_test_utils as wutils
+import acts.test_utils.wifi.wifi_test_utils as wutils
import acts.utils
from acts import asserts
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.wifi.WifiBaseTest import WifiBaseTest
+from acts.test_utils.wifi.WifiBaseTest import WifiBaseTest
WifiEnums = wutils.WifiEnums
# Timeout used for crash recovery.
diff --git a/acts_tests/tests/google/wifi/WifiDiagnosticsTest.py b/acts_tests/tests/google/wifi/WifiDiagnosticsTest.py
index a166b9d..9e5a46f 100644
--- a/acts_tests/tests/google/wifi/WifiDiagnosticsTest.py
+++ b/acts_tests/tests/google/wifi/WifiDiagnosticsTest.py
@@ -21,12 +21,12 @@
import acts.base_test
import acts.signals as signals
-import acts_contrib.test_utils.wifi.wifi_test_utils as wutils
+import acts.test_utils.wifi.wifi_test_utils as wutils
import acts.utils
from acts import asserts
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.wifi.WifiBaseTest import WifiBaseTest
+from acts.test_utils.wifi.WifiBaseTest import WifiBaseTest
WifiEnums = wutils.WifiEnums
diff --git a/acts_tests/tests/google/wifi/WifiDppTest.py b/acts_tests/tests/google/wifi/WifiDppTest.py
index e9b9a94..64f7f25 100644
--- a/acts_tests/tests/google/wifi/WifiDppTest.py
+++ b/acts_tests/tests/google/wifi/WifiDppTest.py
@@ -21,10 +21,10 @@
from acts import asserts
from acts import utils
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.wifi import wifi_constants
-from acts_contrib.test_utils.wifi import wifi_test_utils as wutils
-from acts_contrib.test_utils.wifi.WifiBaseTest import WifiBaseTest
-from acts_contrib.test_utils.wifi.aware import aware_test_utils as autils
+from acts.test_utils.wifi import wifi_constants
+from acts.test_utils.wifi import wifi_test_utils as wutils
+from acts.test_utils.wifi.WifiBaseTest import WifiBaseTest
+from acts.test_utils.wifi.aware import aware_test_utils as autils
class WifiDppTest(WifiBaseTest):
"""This class tests the DPP API surface.
diff --git a/acts_tests/tests/google/wifi/WifiEnterpriseRoamingTest.py b/acts_tests/tests/google/wifi/WifiEnterpriseRoamingTest.py
index b33579c..05b3549 100644
--- a/acts_tests/tests/google/wifi/WifiEnterpriseRoamingTest.py
+++ b/acts_tests/tests/google/wifi/WifiEnterpriseRoamingTest.py
@@ -20,8 +20,8 @@
from acts import asserts
from acts import signals
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.wifi import wifi_test_utils as wutils
-from acts_contrib.test_utils.wifi.WifiBaseTest import WifiBaseTest
+from acts.test_utils.wifi import wifi_test_utils as wutils
+from acts.test_utils.wifi.WifiBaseTest import WifiBaseTest
WifiEnums = wutils.WifiEnums
diff --git a/acts_tests/tests/google/wifi/WifiEnterpriseTest.py b/acts_tests/tests/google/wifi/WifiEnterpriseTest.py
index 222a505..aee773c 100644
--- a/acts_tests/tests/google/wifi/WifiEnterpriseTest.py
+++ b/acts_tests/tests/google/wifi/WifiEnterpriseTest.py
@@ -21,8 +21,8 @@
from acts import asserts
from acts import signals
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.wifi import wifi_test_utils as wutils
-from acts_contrib.test_utils.wifi.WifiBaseTest import WifiBaseTest
+from acts.test_utils.wifi import wifi_test_utils as wutils
+from acts.test_utils.wifi.WifiBaseTest import WifiBaseTest
WifiEnums = wutils.WifiEnums
diff --git a/acts_tests/tests/google/wifi/WifiHiddenSSIDTest.py b/acts_tests/tests/google/wifi/WifiHiddenSSIDTest.py
index 88736f8..da2c066 100644
--- a/acts_tests/tests/google/wifi/WifiHiddenSSIDTest.py
+++ b/acts_tests/tests/google/wifi/WifiHiddenSSIDTest.py
@@ -15,10 +15,10 @@
# limitations under the License.
import acts.signals
-import acts_contrib.test_utils.wifi.wifi_test_utils as wutils
+import acts.test_utils.wifi.wifi_test_utils as wutils
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.wifi.WifiBaseTest import WifiBaseTest
+from acts.test_utils.wifi.WifiBaseTest import WifiBaseTest
class WifiHiddenSSIDTest(WifiBaseTest):
diff --git a/acts_tests/tests/google/wifi/WifiIFSTwTest.py b/acts_tests/tests/google/wifi/WifiIFSTwTest.py
index ef24d4d..ac2022f 100644
--- a/acts_tests/tests/google/wifi/WifiIFSTwTest.py
+++ b/acts_tests/tests/google/wifi/WifiIFSTwTest.py
@@ -25,10 +25,10 @@
from acts.controllers import attenuator
from acts.controllers.sl4a_lib import rpc_client
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.net.net_test_utils import start_tcpdump, stop_tcpdump
-from acts_contrib.test_utils.wifi import wifi_test_utils as wutils
-from acts_contrib.test_utils.wifi.wifi_test_utils import WifiEnums
-from acts_contrib.test_utils.wifi.WifiBaseTest import WifiBaseTest
+from acts.test_utils.net.net_test_utils import start_tcpdump, stop_tcpdump
+from acts.test_utils.wifi import wifi_test_utils as wutils
+from acts.test_utils.wifi.wifi_test_utils import WifiEnums
+from acts.test_utils.wifi.WifiBaseTest import WifiBaseTest
from acts.utils import stop_standing_subprocess
TCPDUMP_PATH = '/data/local/tmp/tcpdump'
diff --git a/acts_tests/tests/google/wifi/WifiIOTTest.py b/acts_tests/tests/google/wifi/WifiIOTTest.py
index 973fc08..3ea3b3b 100644
--- a/acts_tests/tests/google/wifi/WifiIOTTest.py
+++ b/acts_tests/tests/google/wifi/WifiIOTTest.py
@@ -19,11 +19,11 @@
import time
import acts.signals
-import acts_contrib.test_utils.wifi.wifi_test_utils as wutils
+import acts.test_utils.wifi.wifi_test_utils as wutils
from acts import asserts
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.wifi.WifiBaseTest import WifiBaseTest
+from acts.test_utils.wifi.WifiBaseTest import WifiBaseTest
WifiEnums = wutils.WifiEnums
diff --git a/acts_tests/tests/google/wifi/WifiIOTTwPkg1Test.py b/acts_tests/tests/google/wifi/WifiIOTTwPkg1Test.py
index 9669cdd..ed0d8d7 100644
--- a/acts_tests/tests/google/wifi/WifiIOTTwPkg1Test.py
+++ b/acts_tests/tests/google/wifi/WifiIOTTwPkg1Test.py
@@ -19,11 +19,11 @@
import time
import acts.signals
-import acts_contrib.test_utils.wifi.wifi_test_utils as wutils
+import acts.test_utils.wifi.wifi_test_utils as wutils
from acts import asserts
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.wifi.WifiBaseTest import WifiBaseTest
+from acts.test_utils.wifi.WifiBaseTest import WifiBaseTest
from acts.controllers import iperf_server as ipf
import json
diff --git a/acts_tests/tests/google/wifi/WifiIOTtpeTest.py b/acts_tests/tests/google/wifi/WifiIOTtpeTest.py
index 8244fb8..3a00d0c 100644
--- a/acts_tests/tests/google/wifi/WifiIOTtpeTest.py
+++ b/acts_tests/tests/google/wifi/WifiIOTtpeTest.py
@@ -19,11 +19,11 @@
import time
import acts.signals
-import acts_contrib.test_utils.wifi.wifi_test_utils as wutils
+import acts.test_utils.wifi.wifi_test_utils as wutils
from acts import asserts
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.wifi.WifiBaseTest import WifiBaseTest
+from acts.test_utils.wifi.WifiBaseTest import WifiBaseTest
WifiEnums = wutils.WifiEnums
diff --git a/acts_tests/tests/google/wifi/WifiLinkProbeTest.py b/acts_tests/tests/google/wifi/WifiLinkProbeTest.py
index 8dd1a97..de202b8 100644
--- a/acts_tests/tests/google/wifi/WifiLinkProbeTest.py
+++ b/acts_tests/tests/google/wifi/WifiLinkProbeTest.py
@@ -18,8 +18,8 @@
from acts import asserts
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.wifi.WifiBaseTest import WifiBaseTest
-import acts_contrib.test_utils.wifi.wifi_test_utils as wutils
+from acts.test_utils.wifi.WifiBaseTest import WifiBaseTest
+import acts.test_utils.wifi.wifi_test_utils as wutils
WifiEnums = wutils.WifiEnums
NUM_LINK_PROBES = 8
diff --git a/acts_tests/tests/google/wifi/WifiMacRandomizationTest.py b/acts_tests/tests/google/wifi/WifiMacRandomizationTest.py
index d779529..f3b5102 100644
--- a/acts_tests/tests/google/wifi/WifiMacRandomizationTest.py
+++ b/acts_tests/tests/google/wifi/WifiMacRandomizationTest.py
@@ -22,14 +22,14 @@
import acts.base_test
import acts.signals as signals
-import acts_contrib.test_utils.wifi.wifi_test_utils as wutils
+import acts.test_utils.wifi.wifi_test_utils as wutils
import acts.utils
from acts import asserts
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.tel.tel_test_utils import WIFI_CONFIG_APBAND_2G
-from acts_contrib.test_utils.tel.tel_test_utils import WIFI_CONFIG_APBAND_5G
-from acts_contrib.test_utils.wifi.WifiBaseTest import WifiBaseTest
+from acts.test_utils.tel.tel_test_utils import WIFI_CONFIG_APBAND_2G
+from acts.test_utils.tel.tel_test_utils import WIFI_CONFIG_APBAND_5G
+from acts.test_utils.wifi.WifiBaseTest import WifiBaseTest
from scapy.all import *
from acts.controllers.ap_lib import hostapd_constants
diff --git a/acts_tests/tests/google/wifi/WifiManagerTest.py b/acts_tests/tests/google/wifi/WifiManagerTest.py
index e220c2a..8b4c197 100644
--- a/acts_tests/tests/google/wifi/WifiManagerTest.py
+++ b/acts_tests/tests/google/wifi/WifiManagerTest.py
@@ -21,14 +21,14 @@
import acts.base_test
import acts.signals as signals
-import acts_contrib.test_utils.wifi.wifi_test_utils as wutils
+import acts.test_utils.wifi.wifi_test_utils as wutils
import acts.utils
from acts import asserts
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.bt.bt_test_utils import enable_bluetooth
-from acts_contrib.test_utils.bt.bt_test_utils import disable_bluetooth
-from acts_contrib.test_utils.wifi.WifiBaseTest import WifiBaseTest
+from acts.test_utils.bt.bt_test_utils import enable_bluetooth
+from acts.test_utils.bt.bt_test_utils import disable_bluetooth
+from acts.test_utils.wifi.WifiBaseTest import WifiBaseTest
WifiEnums = wutils.WifiEnums
# Default timeout used for reboot, toggle WiFi and Airplane mode,
diff --git a/acts_tests/tests/google/wifi/WifiNetworkRequestTest.py b/acts_tests/tests/google/wifi/WifiNetworkRequestTest.py
index af28280..81aa86d 100644
--- a/acts_tests/tests/google/wifi/WifiNetworkRequestTest.py
+++ b/acts_tests/tests/google/wifi/WifiNetworkRequestTest.py
@@ -21,14 +21,14 @@
import acts.base_test
import acts.signals as signals
-import acts_contrib.test_utils.wifi.wifi_test_utils as wutils
+import acts.test_utils.wifi.wifi_test_utils as wutils
import acts.utils
from acts import asserts
from acts.controllers.android_device import SL4A_APK_NAME
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.wifi.WifiBaseTest import WifiBaseTest
-from acts_contrib.test_utils.wifi import wifi_constants
+from acts.test_utils.wifi.WifiBaseTest import WifiBaseTest
+from acts.test_utils.wifi import wifi_constants
WifiEnums = wutils.WifiEnums
diff --git a/acts_tests/tests/google/wifi/WifiNetworkSelectorTest.py b/acts_tests/tests/google/wifi/WifiNetworkSelectorTest.py
index 0d13a0b..7de603c 100644
--- a/acts_tests/tests/google/wifi/WifiNetworkSelectorTest.py
+++ b/acts_tests/tests/google/wifi/WifiNetworkSelectorTest.py
@@ -24,8 +24,8 @@
from acts.controllers import android_device
from acts.controllers import attenuator
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.wifi import wifi_test_utils as wutils
-from acts_contrib.test_utils.wifi.WifiBaseTest import WifiBaseTest
+from acts.test_utils.wifi import wifi_test_utils as wutils
+from acts.test_utils.wifi.WifiBaseTest import WifiBaseTest
WifiEnums = wutils.WifiEnums
diff --git a/acts_tests/tests/google/wifi/WifiNetworkSuggestionTest.py b/acts_tests/tests/google/wifi/WifiNetworkSuggestionTest.py
index db6dbab..3290091 100644
--- a/acts_tests/tests/google/wifi/WifiNetworkSuggestionTest.py
+++ b/acts_tests/tests/google/wifi/WifiNetworkSuggestionTest.py
@@ -21,14 +21,14 @@
import acts.base_test
import acts.signals as signals
-import acts_contrib.test_utils.wifi.wifi_test_utils as wutils
+import acts.test_utils.wifi.wifi_test_utils as wutils
import acts.utils
from acts import asserts
from acts.controllers.android_device import SL4A_APK_NAME
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.wifi.WifiBaseTest import WifiBaseTest
-from acts_contrib.test_utils.wifi import wifi_constants
+from acts.test_utils.wifi.WifiBaseTest import WifiBaseTest
+from acts.test_utils.wifi import wifi_constants
WifiEnums = wutils.WifiEnums
# EAP Macros
diff --git a/acts_tests/tests/google/wifi/WifiNewSetupAutoJoinTest.py b/acts_tests/tests/google/wifi/WifiNewSetupAutoJoinTest.py
index f52dd6e..59d65e7 100644
--- a/acts_tests/tests/google/wifi/WifiNewSetupAutoJoinTest.py
+++ b/acts_tests/tests/google/wifi/WifiNewSetupAutoJoinTest.py
@@ -19,9 +19,9 @@
from acts import asserts
from acts import base_test
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.wifi import wifi_constants
-from acts_contrib.test_utils.wifi import wifi_test_utils as wutils
-from acts_contrib.test_utils.wifi.WifiBaseTest import WifiBaseTest
+from acts.test_utils.wifi import wifi_constants
+from acts.test_utils.wifi import wifi_test_utils as wutils
+from acts.test_utils.wifi.WifiBaseTest import WifiBaseTest
WifiEnums = wutils.WifiEnums
NETWORK_ID_ERROR = "Network don't have ID"
diff --git a/acts_tests/tests/google/wifi/WifiPasspointTest.py b/acts_tests/tests/google/wifi/WifiPasspointTest.py
index 0c230f7..4998ac4 100755
--- a/acts_tests/tests/google/wifi/WifiPasspointTest.py
+++ b/acts_tests/tests/google/wifi/WifiPasspointTest.py
@@ -19,15 +19,15 @@
import queue
import time
-from acts_contrib.test_utils.net import ui_utils as uutils
-import acts_contrib.test_utils.wifi.wifi_test_utils as wutils
-from acts_contrib.test_utils.wifi.WifiBaseTest import WifiBaseTest
+from acts.test_utils.net import ui_utils as uutils
+import acts.test_utils.wifi.wifi_test_utils as wutils
+from acts.test_utils.wifi.WifiBaseTest import WifiBaseTest
import WifiManagerTest
from acts import asserts
from acts import signals
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.tel.tel_test_utils import get_operator_name
+from acts.test_utils.tel.tel_test_utils import get_operator_name
from acts.utils import force_airplane_mode
WifiEnums = wutils.WifiEnums
diff --git a/acts_tests/tests/google/wifi/WifiPerformancePreflightTest.py b/acts_tests/tests/google/wifi/WifiPerformancePreflightTest.py
index 4492090..97d9374 100644
--- a/acts_tests/tests/google/wifi/WifiPerformancePreflightTest.py
+++ b/acts_tests/tests/google/wifi/WifiPerformancePreflightTest.py
@@ -16,8 +16,8 @@
from acts import base_test
from acts.metrics.loggers.blackbox import BlackboxMappedMetricLogger
-from acts_contrib.test_utils.wifi import wifi_performance_test_utils as wputils
-from acts_contrib.test_utils.wifi import wifi_retail_ap as retail_ap
+from acts.test_utils.wifi import wifi_performance_test_utils as wputils
+from acts.test_utils.wifi import wifi_retail_ap as retail_ap
class WifiPerformancePreflightTest(base_test.BaseTestClass):
diff --git a/acts_tests/tests/google/wifi/WifiPingTest.py b/acts_tests/tests/google/wifi/WifiPingTest.py
index 0fb3823..1df52d5 100644
--- a/acts_tests/tests/google/wifi/WifiPingTest.py
+++ b/acts_tests/tests/google/wifi/WifiPingTest.py
@@ -26,11 +26,11 @@
from acts import utils
from acts.controllers.utils_lib import ssh
from acts.metrics.loggers.blackbox import BlackboxMappedMetricLogger
-from acts_contrib.test_utils.wifi import ota_chamber
-from acts_contrib.test_utils.wifi import ota_sniffer
-from acts_contrib.test_utils.wifi import wifi_performance_test_utils as wputils
-from acts_contrib.test_utils.wifi import wifi_retail_ap as retail_ap
-from acts_contrib.test_utils.wifi import wifi_test_utils as wutils
+from acts.test_utils.wifi import ota_chamber
+from acts.test_utils.wifi import ota_sniffer
+from acts.test_utils.wifi import wifi_performance_test_utils as wputils
+from acts.test_utils.wifi import wifi_retail_ap as retail_ap
+from acts.test_utils.wifi import wifi_test_utils as wutils
from functools import partial
diff --git a/acts_tests/tests/google/wifi/WifiPnoTest.py b/acts_tests/tests/google/wifi/WifiPnoTest.py
index a2caefd..879ca0d 100644
--- a/acts_tests/tests/google/wifi/WifiPnoTest.py
+++ b/acts_tests/tests/google/wifi/WifiPnoTest.py
@@ -18,8 +18,8 @@
from acts import asserts
from acts import base_test
from acts.test_decorators import test_tracker_info
-import acts_contrib.test_utils.wifi.wifi_test_utils as wutils
-from acts_contrib.test_utils.wifi.WifiBaseTest import WifiBaseTest
+import acts.test_utils.wifi.wifi_test_utils as wutils
+from acts.test_utils.wifi.WifiBaseTest import WifiBaseTest
WifiEnums = wutils.WifiEnums
MAX_ATTN = 95
diff --git a/acts_tests/tests/google/wifi/WifiPreFlightTest.py b/acts_tests/tests/google/wifi/WifiPreFlightTest.py
index 3d0db2d..14a4190 100644
--- a/acts_tests/tests/google/wifi/WifiPreFlightTest.py
+++ b/acts_tests/tests/google/wifi/WifiPreFlightTest.py
@@ -19,11 +19,11 @@
import time
import acts.base_test
-import acts_contrib.test_utils.wifi.wifi_test_utils as wutils
+import acts.test_utils.wifi.wifi_test_utils as wutils
from acts import asserts
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.wifi.WifiBaseTest import WifiBaseTest
+from acts.test_utils.wifi.WifiBaseTest import WifiBaseTest
SCAN_TIME = 30
WAIT_TIME = 2
diff --git a/acts_tests/tests/google/wifi/WifiRoamingPerformanceTest.py b/acts_tests/tests/google/wifi/WifiRoamingPerformanceTest.py
index e011866..bfc96d5 100644
--- a/acts_tests/tests/google/wifi/WifiRoamingPerformanceTest.py
+++ b/acts_tests/tests/google/wifi/WifiRoamingPerformanceTest.py
@@ -26,9 +26,9 @@
from acts.controllers import iperf_server as ipf
from acts.controllers.utils_lib import ssh
from acts.metrics.loggers.blackbox import BlackboxMappedMetricLogger
-from acts_contrib.test_utils.wifi import wifi_performance_test_utils as wputils
-from acts_contrib.test_utils.wifi import wifi_retail_ap as retail_ap
-from acts_contrib.test_utils.wifi import wifi_test_utils as wutils
+from acts.test_utils.wifi import wifi_performance_test_utils as wputils
+from acts.test_utils.wifi import wifi_retail_ap as retail_ap
+from acts.test_utils.wifi import wifi_test_utils as wutils
SHORT_SLEEP = 1
MED_SLEEP = 5
diff --git a/acts_tests/tests/google/wifi/WifiRoamingTest.py b/acts_tests/tests/google/wifi/WifiRoamingTest.py
index 21f1cbf..0ef6bb6 100644
--- a/acts_tests/tests/google/wifi/WifiRoamingTest.py
+++ b/acts_tests/tests/google/wifi/WifiRoamingTest.py
@@ -15,8 +15,8 @@
from acts import asserts
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.wifi import wifi_test_utils as wutils
-from acts_contrib.test_utils.wifi.WifiBaseTest import WifiBaseTest
+from acts.test_utils.wifi import wifi_test_utils as wutils
+from acts.test_utils.wifi.WifiBaseTest import WifiBaseTest
class WifiRoamingTest(WifiBaseTest):
diff --git a/acts_tests/tests/google/wifi/WifiRssiTest.py b/acts_tests/tests/google/wifi/WifiRssiTest.py
index 3055985..9ff9afa 100644
--- a/acts_tests/tests/google/wifi/WifiRssiTest.py
+++ b/acts_tests/tests/google/wifi/WifiRssiTest.py
@@ -29,10 +29,10 @@
from acts.controllers.utils_lib import ssh
from acts.controllers import iperf_server as ipf
from acts.metrics.loggers.blackbox import BlackboxMappedMetricLogger
-from acts_contrib.test_utils.wifi import ota_chamber
-from acts_contrib.test_utils.wifi import wifi_performance_test_utils as wputils
-from acts_contrib.test_utils.wifi import wifi_retail_ap as retail_ap
-from acts_contrib.test_utils.wifi import wifi_test_utils as wutils
+from acts.test_utils.wifi import ota_chamber
+from acts.test_utils.wifi import wifi_performance_test_utils as wputils
+from acts.test_utils.wifi import wifi_retail_ap as retail_ap
+from acts.test_utils.wifi import wifi_test_utils as wutils
from concurrent.futures import ThreadPoolExecutor
from functools import partial
diff --git a/acts_tests/tests/google/wifi/WifiRttManagerTest.py b/acts_tests/tests/google/wifi/WifiRttManagerTest.py
index 4d558e6..f0985de 100644
--- a/acts_tests/tests/google/wifi/WifiRttManagerTest.py
+++ b/acts_tests/tests/google/wifi/WifiRttManagerTest.py
@@ -18,7 +18,7 @@
import queue
import acts.base_test
-import acts_contrib.test_utils.wifi.wifi_test_utils as wutils
+import acts.test_utils.wifi.wifi_test_utils as wutils
import acts.utils
from acts import asserts
from acts.controllers.sl4a_lib import rpc_client
diff --git a/acts_tests/tests/google/wifi/WifiRvrTest.py b/acts_tests/tests/google/wifi/WifiRvrTest.py
index ae839df..979ac76 100644
--- a/acts_tests/tests/google/wifi/WifiRvrTest.py
+++ b/acts_tests/tests/google/wifi/WifiRvrTest.py
@@ -27,11 +27,11 @@
from acts.controllers import iperf_server as ipf
from acts.controllers.utils_lib import ssh
from acts.metrics.loggers.blackbox import BlackboxMappedMetricLogger
-from acts_contrib.test_utils.wifi import ota_chamber
-from acts_contrib.test_utils.wifi import ota_sniffer
-from acts_contrib.test_utils.wifi import wifi_performance_test_utils as wputils
-from acts_contrib.test_utils.wifi import wifi_retail_ap as retail_ap
-from acts_contrib.test_utils.wifi import wifi_test_utils as wutils
+from acts.test_utils.wifi import ota_chamber
+from acts.test_utils.wifi import ota_sniffer
+from acts.test_utils.wifi import wifi_performance_test_utils as wputils
+from acts.test_utils.wifi import wifi_retail_ap as retail_ap
+from acts.test_utils.wifi import wifi_test_utils as wutils
from functools import partial
diff --git a/acts_tests/tests/google/wifi/WifiRvrTwTest.py b/acts_tests/tests/google/wifi/WifiRvrTwTest.py
index e732b83..2f9dc12 100644
--- a/acts_tests/tests/google/wifi/WifiRvrTwTest.py
+++ b/acts_tests/tests/google/wifi/WifiRvrTwTest.py
@@ -19,11 +19,11 @@
import time
import acts.signals
-import acts_contrib.test_utils.wifi.wifi_test_utils as wutils
+import acts.test_utils.wifi.wifi_test_utils as wutils
from acts import asserts
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.wifi.WifiBaseTest import WifiBaseTest
+from acts.test_utils.wifi.WifiBaseTest import WifiBaseTest
from acts.controllers import iperf_server as ipf
import json
diff --git a/acts_tests/tests/google/wifi/WifiScannerBssidTest.py b/acts_tests/tests/google/wifi/WifiScannerBssidTest.py
index dd75444..e91c449 100644
--- a/acts_tests/tests/google/wifi/WifiScannerBssidTest.py
+++ b/acts_tests/tests/google/wifi/WifiScannerBssidTest.py
@@ -21,7 +21,7 @@
from acts import base_test
from acts import utils
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.wifi import wifi_test_utils as wutils
+from acts.test_utils.wifi import wifi_test_utils as wutils
BSSID_EVENT_WAIT = 30
diff --git a/acts_tests/tests/google/wifi/WifiScannerMultiScanTest.py b/acts_tests/tests/google/wifi/WifiScannerMultiScanTest.py
index fb75b60..da88012 100755
--- a/acts_tests/tests/google/wifi/WifiScannerMultiScanTest.py
+++ b/acts_tests/tests/google/wifi/WifiScannerMultiScanTest.py
@@ -21,8 +21,8 @@
from acts import base_test
from acts import signals
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.wifi import wifi_test_utils as wutils
-from acts_contrib.test_utils.wifi.WifiBaseTest import WifiBaseTest
+from acts.test_utils.wifi import wifi_test_utils as wutils
+from acts.test_utils.wifi.WifiBaseTest import WifiBaseTest
WifiChannelUS = wutils.WifiChannelUS
WifiEnums = wutils.WifiEnums
diff --git a/acts_tests/tests/google/wifi/WifiScannerScanTest.py b/acts_tests/tests/google/wifi/WifiScannerScanTest.py
index af84ce4..f267078 100755
--- a/acts_tests/tests/google/wifi/WifiScannerScanTest.py
+++ b/acts_tests/tests/google/wifi/WifiScannerScanTest.py
@@ -22,9 +22,9 @@
from acts import asserts
from acts import utils
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.wifi import wifi_constants
-from acts_contrib.test_utils.wifi import wifi_test_utils as wutils
-from acts_contrib.test_utils.wifi.WifiBaseTest import WifiBaseTest
+from acts.test_utils.wifi import wifi_constants
+from acts.test_utils.wifi import wifi_test_utils as wutils
+from acts.test_utils.wifi.WifiBaseTest import WifiBaseTest
SCANTIME = 10000 #framework support only 10s as minimum scan interval
NUMBSSIDPERSCAN = 8
diff --git a/acts_tests/tests/google/wifi/WifiSensitivityTest.py b/acts_tests/tests/google/wifi/WifiSensitivityTest.py
index 3172aaa..7307850 100644
--- a/acts_tests/tests/google/wifi/WifiSensitivityTest.py
+++ b/acts_tests/tests/google/wifi/WifiSensitivityTest.py
@@ -27,10 +27,10 @@
from acts.controllers import iperf_client
from acts.controllers.utils_lib import ssh
from acts.metrics.loggers.blackbox import BlackboxMappedMetricLogger
-from acts_contrib.test_utils.wifi import ota_chamber
-from acts_contrib.test_utils.wifi import wifi_performance_test_utils as wputils
-from acts_contrib.test_utils.wifi import wifi_test_utils as wutils
-from acts_contrib.test_utils.wifi import wifi_retail_ap as retail_ap
+from acts.test_utils.wifi import ota_chamber
+from acts.test_utils.wifi import wifi_performance_test_utils as wputils
+from acts.test_utils.wifi import wifi_test_utils as wutils
+from acts.test_utils.wifi import wifi_retail_ap as retail_ap
from functools import partial
from WifiRvrTest import WifiRvrTest
from WifiPingTest import WifiPingTest
diff --git a/acts_tests/tests/google/wifi/WifiServiceApiTest.py b/acts_tests/tests/google/wifi/WifiServiceApiTest.py
index b656b7b..afe2a84 100644
--- a/acts_tests/tests/google/wifi/WifiServiceApiTest.py
+++ b/acts_tests/tests/google/wifi/WifiServiceApiTest.py
@@ -22,9 +22,9 @@
from acts import signals
from acts import utils
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.wifi import wifi_constants
-from acts_contrib.test_utils.wifi import wifi_test_utils as wutils
-from acts_contrib.test_utils.wifi.WifiBaseTest import WifiBaseTest
+from acts.test_utils.wifi import wifi_constants
+from acts.test_utils.wifi import wifi_test_utils as wutils
+from acts.test_utils.wifi.WifiBaseTest import WifiBaseTest
class WifiServiceApiTest(WifiBaseTest):
diff --git a/acts_tests/tests/google/wifi/WifiSoftApAcsTest.py b/acts_tests/tests/google/wifi/WifiSoftApAcsTest.py
index 5595f4b..a3cbdfe 100644
--- a/acts_tests/tests/google/wifi/WifiSoftApAcsTest.py
+++ b/acts_tests/tests/google/wifi/WifiSoftApAcsTest.py
@@ -22,15 +22,15 @@
import acts.base_test
import acts.signals as signals
-import acts_contrib.test_utils.wifi.wifi_test_utils as wutils
+import acts.test_utils.wifi.wifi_test_utils as wutils
import acts.utils as utils
from acts import asserts
from acts.controllers.ap_lib import hostapd_constants
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.tel.tel_test_utils import WIFI_CONFIG_APBAND_2G
-from acts_contrib.test_utils.tel.tel_test_utils import WIFI_CONFIG_APBAND_5G
-from acts_contrib.test_utils.wifi.WifiBaseTest import WifiBaseTest
+from acts.test_utils.tel.tel_test_utils import WIFI_CONFIG_APBAND_2G
+from acts.test_utils.tel.tel_test_utils import WIFI_CONFIG_APBAND_5G
+from acts.test_utils.wifi.WifiBaseTest import WifiBaseTest
from threading import Thread
WifiEnums = wutils.WifiEnums
diff --git a/acts_tests/tests/google/wifi/WifiSoftApPerformanceTest.py b/acts_tests/tests/google/wifi/WifiSoftApPerformanceTest.py
index 4e4fb89..375ae93 100644
--- a/acts_tests/tests/google/wifi/WifiSoftApPerformanceTest.py
+++ b/acts_tests/tests/google/wifi/WifiSoftApPerformanceTest.py
@@ -22,10 +22,10 @@
from acts.controllers import iperf_server as ipf
from acts.controllers import iperf_client as ipc
from acts.metrics.loggers.blackbox import BlackboxMappedMetricLogger
-from acts_contrib.test_utils.wifi import ota_sniffer
-from acts_contrib.test_utils.wifi import wifi_test_utils as wutils
-from acts_contrib.test_utils.wifi import wifi_performance_test_utils as wputils
-from acts_contrib.test_utils.wifi import wifi_retail_ap as retail_ap
+from acts.test_utils.wifi import ota_sniffer
+from acts.test_utils.wifi import wifi_test_utils as wutils
+from acts.test_utils.wifi import wifi_performance_test_utils as wputils
+from acts.test_utils.wifi import wifi_retail_ap as retail_ap
from WifiRvrTest import WifiRvrTest
AccessPointTuple = collections.namedtuple(('AccessPointTuple'),
diff --git a/acts_tests/tests/google/wifi/WifiSoftApTest.py b/acts_tests/tests/google/wifi/WifiSoftApTest.py
index 42bede1..bcaab8d 100644
--- a/acts_tests/tests/google/wifi/WifiSoftApTest.py
+++ b/acts_tests/tests/google/wifi/WifiSoftApTest.py
@@ -22,15 +22,15 @@
from acts import asserts
from acts import utils
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.net import socket_test_utils as sutils
-from acts_contrib.test_utils.tel import tel_defines
-from acts_contrib.test_utils.tel import tel_test_utils as tel_utils
-from acts_contrib.test_utils.tel.tel_test_utils import WIFI_CONFIG_APBAND_2G
-from acts_contrib.test_utils.tel.tel_test_utils import WIFI_CONFIG_APBAND_5G
-from acts_contrib.test_utils.tel.tel_test_utils import WIFI_CONFIG_APBAND_AUTO
-from acts_contrib.test_utils.wifi import wifi_constants
-from acts_contrib.test_utils.wifi import wifi_test_utils as wutils
-from acts_contrib.test_utils.wifi.WifiBaseTest import WifiBaseTest
+from acts.test_utils.net import socket_test_utils as sutils
+from acts.test_utils.tel import tel_defines
+from acts.test_utils.tel import tel_test_utils as tel_utils
+from acts.test_utils.tel.tel_test_utils import WIFI_CONFIG_APBAND_2G
+from acts.test_utils.tel.tel_test_utils import WIFI_CONFIG_APBAND_5G
+from acts.test_utils.tel.tel_test_utils import WIFI_CONFIG_APBAND_AUTO
+from acts.test_utils.wifi import wifi_constants
+from acts.test_utils.wifi import wifi_test_utils as wutils
+from acts.test_utils.wifi.WifiBaseTest import WifiBaseTest
WifiEnums = wutils.WifiEnums
diff --git a/acts_tests/tests/google/wifi/WifiStaApConcurrencyStressTest.py b/acts_tests/tests/google/wifi/WifiStaApConcurrencyStressTest.py
index 7a10f03..f84c06c 100755
--- a/acts_tests/tests/google/wifi/WifiStaApConcurrencyStressTest.py
+++ b/acts_tests/tests/google/wifi/WifiStaApConcurrencyStressTest.py
@@ -21,10 +21,10 @@
from acts import signals
from acts import utils
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.tel.tel_test_utils import WIFI_CONFIG_APBAND_2G
-from acts_contrib.test_utils.tel.tel_test_utils import WIFI_CONFIG_APBAND_5G
+from acts.test_utils.tel.tel_test_utils import WIFI_CONFIG_APBAND_2G
+from acts.test_utils.tel.tel_test_utils import WIFI_CONFIG_APBAND_5G
from WifiStaApConcurrencyTest import WifiStaApConcurrencyTest
-import acts_contrib.test_utils.wifi.wifi_test_utils as wutils
+import acts.test_utils.wifi.wifi_test_utils as wutils
WifiEnums = wutils.WifiEnums
diff --git a/acts_tests/tests/google/wifi/WifiStaApConcurrencyTest.py b/acts_tests/tests/google/wifi/WifiStaApConcurrencyTest.py
index 6694cb9..035cac3 100644
--- a/acts_tests/tests/google/wifi/WifiStaApConcurrencyTest.py
+++ b/acts_tests/tests/google/wifi/WifiStaApConcurrencyTest.py
@@ -23,12 +23,12 @@
from acts.controllers.ap_lib import hostapd_constants
import acts.signals as signals
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.tel.tel_test_utils import WIFI_CONFIG_APBAND_2G
-from acts_contrib.test_utils.tel.tel_test_utils import WIFI_CONFIG_APBAND_5G
-import acts_contrib.test_utils.wifi.wifi_test_utils as wutils
-from acts_contrib.test_utils.wifi.WifiBaseTest import WifiBaseTest
+from acts.test_utils.tel.tel_test_utils import WIFI_CONFIG_APBAND_2G
+from acts.test_utils.tel.tel_test_utils import WIFI_CONFIG_APBAND_5G
+import acts.test_utils.wifi.wifi_test_utils as wutils
+from acts.test_utils.wifi.WifiBaseTest import WifiBaseTest
import acts.utils as utils
-import acts_contrib.test_utils.tel.tel_test_utils as tel_utils
+import acts.test_utils.tel.tel_test_utils as tel_utils
WifiEnums = wutils.WifiEnums
diff --git a/acts_tests/tests/google/wifi/WifiStressTest.py b/acts_tests/tests/google/wifi/WifiStressTest.py
index 102c7cd..10ba578 100644
--- a/acts_tests/tests/google/wifi/WifiStressTest.py
+++ b/acts_tests/tests/google/wifi/WifiStressTest.py
@@ -20,16 +20,16 @@
import time
import acts.base_test
-import acts_contrib.test_utils.wifi.wifi_test_utils as wutils
-import acts_contrib.test_utils.tel.tel_test_utils as tutils
+import acts.test_utils.wifi.wifi_test_utils as wutils
+import acts.test_utils.tel.tel_test_utils as tutils
from acts import asserts
from acts import signals
from acts import utils
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.bt.bt_test_utils import enable_bluetooth
-from acts_contrib.test_utils.bt.bt_test_utils import disable_bluetooth
-from acts_contrib.test_utils.wifi.WifiBaseTest import WifiBaseTest
+from acts.test_utils.bt.bt_test_utils import enable_bluetooth
+from acts.test_utils.bt.bt_test_utils import disable_bluetooth
+from acts.test_utils.wifi.WifiBaseTest import WifiBaseTest
WifiEnums = wutils.WifiEnums
WAIT_FOR_AUTO_CONNECT = 40
diff --git a/acts_tests/tests/google/wifi/WifiTeleCoexTest.py b/acts_tests/tests/google/wifi/WifiTeleCoexTest.py
index 9e93a9d..6d5fef8 100644
--- a/acts_tests/tests/google/wifi/WifiTeleCoexTest.py
+++ b/acts_tests/tests/google/wifi/WifiTeleCoexTest.py
@@ -4,16 +4,16 @@
import time
import acts.base_test
-import acts_contrib.test_utils.wifi.wifi_test_utils as wifi_utils
-import acts_contrib.test_utils.tel.tel_test_utils as tele_utils
+import acts.test_utils.wifi.wifi_test_utils as wifi_utils
+import acts.test_utils.tel.tel_test_utils as tele_utils
import acts.utils
from acts import asserts
from acts import signals
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
-from acts_contrib.test_utils.tel.tel_voice_utils import phone_setup_voice_general
-from acts_contrib.test_utils.tel.tel_voice_utils import two_phone_call_short_seq
+from acts.test_utils.tel.TelephonyBaseTest import TelephonyBaseTest
+from acts.test_utils.tel.tel_voice_utils import phone_setup_voice_general
+from acts.test_utils.tel.tel_voice_utils import two_phone_call_short_seq
WifiEnums = wifi_utils.WifiEnums
diff --git a/acts_tests/tests/google/wifi/WifiTethering2GOpenOTATest.py b/acts_tests/tests/google/wifi/WifiTethering2GOpenOTATest.py
index 0790546..0716158 100755
--- a/acts_tests/tests/google/wifi/WifiTethering2GOpenOTATest.py
+++ b/acts_tests/tests/google/wifi/WifiTethering2GOpenOTATest.py
@@ -20,10 +20,10 @@
from acts.base_test import BaseTestClass
from acts.libs.ota import ota_updater
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.tel.tel_test_utils import WIFI_CONFIG_APBAND_2G
+from acts.test_utils.tel.tel_test_utils import WIFI_CONFIG_APBAND_2G
-import acts_contrib.test_utils.net.net_test_utils as nutils
-import acts_contrib.test_utils.wifi.wifi_test_utils as wutils
+import acts.test_utils.net.net_test_utils as nutils
+import acts.test_utils.wifi.wifi_test_utils as wutils
class WifiTethering2GOpenOTATest(BaseTestClass):
diff --git a/acts_tests/tests/google/wifi/WifiTethering2GPskOTATest.py b/acts_tests/tests/google/wifi/WifiTethering2GPskOTATest.py
index c0b6d28..7399e32 100755
--- a/acts_tests/tests/google/wifi/WifiTethering2GPskOTATest.py
+++ b/acts_tests/tests/google/wifi/WifiTethering2GPskOTATest.py
@@ -20,10 +20,10 @@
from acts.base_test import BaseTestClass
from acts.libs.ota import ota_updater
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.tel.tel_test_utils import WIFI_CONFIG_APBAND_2G
+from acts.test_utils.tel.tel_test_utils import WIFI_CONFIG_APBAND_2G
-import acts_contrib.test_utils.net.net_test_utils as nutils
-import acts_contrib.test_utils.wifi.wifi_test_utils as wutils
+import acts.test_utils.net.net_test_utils as nutils
+import acts.test_utils.wifi.wifi_test_utils as wutils
class WifiTethering2GPskOTATest(BaseTestClass):
diff --git a/acts_tests/tests/google/wifi/WifiTethering5GOpenOTATest.py b/acts_tests/tests/google/wifi/WifiTethering5GOpenOTATest.py
index 12f6824..985e7a7 100755
--- a/acts_tests/tests/google/wifi/WifiTethering5GOpenOTATest.py
+++ b/acts_tests/tests/google/wifi/WifiTethering5GOpenOTATest.py
@@ -20,10 +20,10 @@
from acts.base_test import BaseTestClass
from acts.libs.ota import ota_updater
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.tel.tel_test_utils import WIFI_CONFIG_APBAND_5G
+from acts.test_utils.tel.tel_test_utils import WIFI_CONFIG_APBAND_5G
-import acts_contrib.test_utils.net.net_test_utils as nutils
-import acts_contrib.test_utils.wifi.wifi_test_utils as wutils
+import acts.test_utils.net.net_test_utils as nutils
+import acts.test_utils.wifi.wifi_test_utils as wutils
class WifiTethering5GOpenOTATest(BaseTestClass):
diff --git a/acts_tests/tests/google/wifi/WifiTethering5GPskOTATest.py b/acts_tests/tests/google/wifi/WifiTethering5GPskOTATest.py
index de0f901..9e68f22 100755
--- a/acts_tests/tests/google/wifi/WifiTethering5GPskOTATest.py
+++ b/acts_tests/tests/google/wifi/WifiTethering5GPskOTATest.py
@@ -20,10 +20,10 @@
from acts.base_test import BaseTestClass
from acts.libs.ota import ota_updater
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.tel.tel_test_utils import WIFI_CONFIG_APBAND_5G
+from acts.test_utils.tel.tel_test_utils import WIFI_CONFIG_APBAND_5G
-import acts_contrib.test_utils.net.net_test_utils as nutils
-import acts_contrib.test_utils.wifi.wifi_test_utils as wutils
+import acts.test_utils.net.net_test_utils as nutils
+import acts.test_utils.wifi.wifi_test_utils as wutils
class WifiTethering5GPskOTATest(BaseTestClass):
diff --git a/acts_tests/tests/google/wifi/WifiTetheringPowerTest.py b/acts_tests/tests/google/wifi/WifiTetheringPowerTest.py
index 577e100..dd3cf74 100644
--- a/acts_tests/tests/google/wifi/WifiTetheringPowerTest.py
+++ b/acts_tests/tests/google/wifi/WifiTetheringPowerTest.py
@@ -23,11 +23,11 @@
from acts.controllers import adb
from acts.controllers import monsoon
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.wifi import wifi_test_utils as wutils
-from acts_contrib.test_utils.tel import tel_data_utils as tel_utils
-from acts_contrib.test_utils.tel.tel_test_utils import WIFI_CONFIG_APBAND_2G
-from acts_contrib.test_utils.tel.tel_test_utils import WIFI_CONFIG_APBAND_5G
-from acts_contrib.test_utils.tel.tel_test_utils import http_file_download_by_chrome
+from acts.test_utils.wifi import wifi_test_utils as wutils
+from acts.test_utils.tel import tel_data_utils as tel_utils
+from acts.test_utils.tel.tel_test_utils import WIFI_CONFIG_APBAND_2G
+from acts.test_utils.tel.tel_test_utils import WIFI_CONFIG_APBAND_5G
+from acts.test_utils.tel.tel_test_utils import http_file_download_by_chrome
from acts.utils import force_airplane_mode
from acts.utils import set_adaptive_brightness
from acts.utils import set_ambient_display
diff --git a/acts_tests/tests/google/wifi/WifiTetheringTest.py b/acts_tests/tests/google/wifi/WifiTetheringTest.py
index 6612faa..56c6427 100644
--- a/acts_tests/tests/google/wifi/WifiTetheringTest.py
+++ b/acts_tests/tests/google/wifi/WifiTetheringTest.py
@@ -23,17 +23,17 @@
from acts import utils
from acts.controllers import adb
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.tel import tel_defines
-from acts_contrib.test_utils.tel.tel_data_utils import wait_for_cell_data_connection
-from acts_contrib.test_utils.tel.tel_test_utils import get_operator_name
-from acts_contrib.test_utils.tel.tel_test_utils import verify_http_connection
-from acts_contrib.test_utils.tel.tel_test_utils import WIFI_CONFIG_APBAND_2G
-from acts_contrib.test_utils.tel.tel_test_utils import WIFI_CONFIG_APBAND_5G
-from acts_contrib.test_utils.net import socket_test_utils as sutils
-from acts_contrib.test_utils.net import arduino_test_utils as dutils
-from acts_contrib.test_utils.net import net_test_utils as nutils
-from acts_contrib.test_utils.wifi import wifi_test_utils as wutils
-from acts_contrib.test_utils.wifi.WifiBaseTest import WifiBaseTest
+from acts.test_utils.tel import tel_defines
+from acts.test_utils.tel.tel_data_utils import wait_for_cell_data_connection
+from acts.test_utils.tel.tel_test_utils import get_operator_name
+from acts.test_utils.tel.tel_test_utils import verify_http_connection
+from acts.test_utils.tel.tel_test_utils import WIFI_CONFIG_APBAND_2G
+from acts.test_utils.tel.tel_test_utils import WIFI_CONFIG_APBAND_5G
+from acts.test_utils.net import socket_test_utils as sutils
+from acts.test_utils.net import arduino_test_utils as dutils
+from acts.test_utils.net import net_test_utils as nutils
+from acts.test_utils.wifi import wifi_test_utils as wutils
+from acts.test_utils.wifi.WifiBaseTest import WifiBaseTest
WAIT_TIME = 5
diff --git a/acts_tests/tests/google/wifi/WifiThroughputStabilityTest.py b/acts_tests/tests/google/wifi/WifiThroughputStabilityTest.py
index 44b4686..71ed011 100644
--- a/acts_tests/tests/google/wifi/WifiThroughputStabilityTest.py
+++ b/acts_tests/tests/google/wifi/WifiThroughputStabilityTest.py
@@ -28,10 +28,10 @@
from acts.controllers import iperf_server as ipf
from acts.controllers.utils_lib import ssh
from acts.metrics.loggers.blackbox import BlackboxMappedMetricLogger
-from acts_contrib.test_utils.wifi import ota_chamber
-from acts_contrib.test_utils.wifi import wifi_performance_test_utils as wputils
-from acts_contrib.test_utils.wifi import wifi_retail_ap as retail_ap
-from acts_contrib.test_utils.wifi import wifi_test_utils as wutils
+from acts.test_utils.wifi import ota_chamber
+from acts.test_utils.wifi import wifi_performance_test_utils as wputils
+from acts.test_utils.wifi import wifi_retail_ap as retail_ap
+from acts.test_utils.wifi import wifi_test_utils as wutils
from functools import partial
TEST_TIMEOUT = 10
diff --git a/acts_tests/tests/google/wifi/WifiWakeTest.py b/acts_tests/tests/google/wifi/WifiWakeTest.py
index 2dc7b20..52ab2fd 100644
--- a/acts_tests/tests/google/wifi/WifiWakeTest.py
+++ b/acts_tests/tests/google/wifi/WifiWakeTest.py
@@ -20,8 +20,8 @@
from acts import asserts
from acts.controllers.android_device import SL4A_APK_NAME
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.wifi.WifiBaseTest import WifiBaseTest
-import acts_contrib.test_utils.wifi.wifi_test_utils as wutils
+from acts.test_utils.wifi.WifiBaseTest import WifiBaseTest
+import acts.test_utils.wifi.wifi_test_utils as wutils
import acts.utils
WifiEnums = wutils.WifiEnums
diff --git a/acts_tests/tests/google/wifi/WifiWpa3EnterpriseTest.py b/acts_tests/tests/google/wifi/WifiWpa3EnterpriseTest.py
index 6a4ba4b..0bfeed3 100644
--- a/acts_tests/tests/google/wifi/WifiWpa3EnterpriseTest.py
+++ b/acts_tests/tests/google/wifi/WifiWpa3EnterpriseTest.py
@@ -16,8 +16,8 @@
from acts import asserts
from acts.test_decorators import test_tracker_info
-import acts_contrib.test_utils.wifi.wifi_test_utils as wutils
-from acts_contrib.test_utils.wifi.WifiBaseTest import WifiBaseTest
+import acts.test_utils.wifi.wifi_test_utils as wutils
+from acts.test_utils.wifi.WifiBaseTest import WifiBaseTest
WifiEnums = wutils.WifiEnums
diff --git a/acts_tests/tests/google/wifi/WifiWpa3OweTest.py b/acts_tests/tests/google/wifi/WifiWpa3OweTest.py
index 02ca6cf..a3c70f3 100644
--- a/acts_tests/tests/google/wifi/WifiWpa3OweTest.py
+++ b/acts_tests/tests/google/wifi/WifiWpa3OweTest.py
@@ -14,10 +14,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-import acts_contrib.test_utils.wifi.wifi_test_utils as wutils
+import acts.test_utils.wifi.wifi_test_utils as wutils
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.wifi.WifiBaseTest import WifiBaseTest
+from acts.test_utils.wifi.WifiBaseTest import WifiBaseTest
class WifiWpa3OweTest(WifiBaseTest):
diff --git a/acts_tests/tests/google/wifi/aware/functional/AttachTest.py b/acts_tests/tests/google/wifi/aware/functional/AttachTest.py
index 89a9bdc..0df82a1 100644
--- a/acts_tests/tests/google/wifi/aware/functional/AttachTest.py
+++ b/acts_tests/tests/google/wifi/aware/functional/AttachTest.py
@@ -19,10 +19,10 @@
from acts import asserts
from acts import utils
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.wifi import wifi_test_utils as wutils
-from acts_contrib.test_utils.wifi.aware import aware_const as aconsts
-from acts_contrib.test_utils.wifi.aware import aware_test_utils as autils
-from acts_contrib.test_utils.wifi.aware.AwareBaseTest import AwareBaseTest
+from acts.test_utils.wifi import wifi_test_utils as wutils
+from acts.test_utils.wifi.aware import aware_const as aconsts
+from acts.test_utils.wifi.aware import aware_test_utils as autils
+from acts.test_utils.wifi.aware.AwareBaseTest import AwareBaseTest
class AttachTest(AwareBaseTest):
diff --git a/acts_tests/tests/google/wifi/aware/functional/CapabilitiesTest.py b/acts_tests/tests/google/wifi/aware/functional/CapabilitiesTest.py
index 6f7c10d..3bed77f 100644
--- a/acts_tests/tests/google/wifi/aware/functional/CapabilitiesTest.py
+++ b/acts_tests/tests/google/wifi/aware/functional/CapabilitiesTest.py
@@ -17,10 +17,10 @@
from acts import asserts
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.net import connectivity_const as cconsts
-from acts_contrib.test_utils.wifi.aware import aware_const as aconsts
-from acts_contrib.test_utils.wifi.aware import aware_test_utils as autils
-from acts_contrib.test_utils.wifi.aware.AwareBaseTest import AwareBaseTest
+from acts.test_utils.net import connectivity_const as cconsts
+from acts.test_utils.wifi.aware import aware_const as aconsts
+from acts.test_utils.wifi.aware import aware_test_utils as autils
+from acts.test_utils.wifi.aware.AwareBaseTest import AwareBaseTest
class CapabilitiesTest(AwareBaseTest):
diff --git a/acts_tests/tests/google/wifi/aware/functional/DataPathTest.py b/acts_tests/tests/google/wifi/aware/functional/DataPathTest.py
index 145b1a6..b8ac693 100644
--- a/acts_tests/tests/google/wifi/aware/functional/DataPathTest.py
+++ b/acts_tests/tests/google/wifi/aware/functional/DataPathTest.py
@@ -18,12 +18,12 @@
from acts import asserts
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.net import connectivity_const as cconsts
-from acts_contrib.test_utils.wifi import wifi_test_utils as wutils
-from acts_contrib.test_utils.wifi.WifiBaseTest import WifiBaseTest
-from acts_contrib.test_utils.wifi.aware import aware_const as aconsts
-from acts_contrib.test_utils.wifi.aware import aware_test_utils as autils
-from acts_contrib.test_utils.wifi.aware.AwareBaseTest import AwareBaseTest
+from acts.test_utils.net import connectivity_const as cconsts
+from acts.test_utils.wifi import wifi_test_utils as wutils
+from acts.test_utils.wifi.WifiBaseTest import WifiBaseTest
+from acts.test_utils.wifi.aware import aware_const as aconsts
+from acts.test_utils.wifi.aware import aware_test_utils as autils
+from acts.test_utils.wifi.aware.AwareBaseTest import AwareBaseTest
class DataPathTest(AwareBaseTest):
diff --git a/acts_tests/tests/google/wifi/aware/functional/DiscoveryTest.py b/acts_tests/tests/google/wifi/aware/functional/DiscoveryTest.py
index 6c4e20f..31255af 100644
--- a/acts_tests/tests/google/wifi/aware/functional/DiscoveryTest.py
+++ b/acts_tests/tests/google/wifi/aware/functional/DiscoveryTest.py
@@ -19,10 +19,10 @@
from acts import asserts
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.wifi.aware import aware_const as aconsts
-from acts_contrib.test_utils.wifi.aware import aware_test_utils as autils
-from acts_contrib.test_utils.wifi.aware.AwareBaseTest import AwareBaseTest
-from acts_contrib.test_utils.wifi.WifiBaseTest import WifiBaseTest
+from acts.test_utils.wifi.aware import aware_const as aconsts
+from acts.test_utils.wifi.aware import aware_test_utils as autils
+from acts.test_utils.wifi.aware.AwareBaseTest import AwareBaseTest
+from acts.test_utils.wifi.WifiBaseTest import WifiBaseTest
class DiscoveryTest(AwareBaseTest):
diff --git a/acts_tests/tests/google/wifi/aware/functional/MacRandomNoLeakageTest.py b/acts_tests/tests/google/wifi/aware/functional/MacRandomNoLeakageTest.py
index d800755..3898832 100644
--- a/acts_tests/tests/google/wifi/aware/functional/MacRandomNoLeakageTest.py
+++ b/acts_tests/tests/google/wifi/aware/functional/MacRandomNoLeakageTest.py
@@ -16,14 +16,14 @@
from acts import asserts
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.net import connectivity_const as cconsts
-from acts_contrib.test_utils.wifi.aware import aware_const as aconsts
+from acts.test_utils.net import connectivity_const as cconsts
+from acts.test_utils.wifi.aware import aware_const as aconsts
from acts.controllers.ap_lib.hostapd_constants import BAND_2G
from acts.controllers.ap_lib.hostapd_constants import BAND_5G
-from acts_contrib.test_utils.wifi.aware import aware_test_utils as autils
-from acts_contrib.test_utils.wifi import wifi_test_utils as wutils
-from acts_contrib.test_utils.wifi.aware.AwareBaseTest import AwareBaseTest
-from acts_contrib.test_utils.wifi.WifiBaseTest import WifiBaseTest
+from acts.test_utils.wifi.aware import aware_test_utils as autils
+from acts.test_utils.wifi import wifi_test_utils as wutils
+from acts.test_utils.wifi.aware.AwareBaseTest import AwareBaseTest
+from acts.test_utils.wifi.WifiBaseTest import WifiBaseTest
from scapy.all import *
diff --git a/acts_tests/tests/google/wifi/aware/functional/MacRandomTest.py b/acts_tests/tests/google/wifi/aware/functional/MacRandomTest.py
index 93bf346..6c8d5b1 100644
--- a/acts_tests/tests/google/wifi/aware/functional/MacRandomTest.py
+++ b/acts_tests/tests/google/wifi/aware/functional/MacRandomTest.py
@@ -18,10 +18,10 @@
from acts import asserts
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.net import connectivity_const as cconsts
-from acts_contrib.test_utils.wifi.aware import aware_const as aconsts
-from acts_contrib.test_utils.wifi.aware import aware_test_utils as autils
-from acts_contrib.test_utils.wifi.aware.AwareBaseTest import AwareBaseTest
+from acts.test_utils.net import connectivity_const as cconsts
+from acts.test_utils.wifi.aware import aware_const as aconsts
+from acts.test_utils.wifi.aware import aware_test_utils as autils
+from acts.test_utils.wifi.aware.AwareBaseTest import AwareBaseTest
class MacRandomTest(AwareBaseTest):
diff --git a/acts_tests/tests/google/wifi/aware/functional/MatchFilterTest.py b/acts_tests/tests/google/wifi/aware/functional/MatchFilterTest.py
index 50eb710..e008e12 100644
--- a/acts_tests/tests/google/wifi/aware/functional/MatchFilterTest.py
+++ b/acts_tests/tests/google/wifi/aware/functional/MatchFilterTest.py
@@ -20,9 +20,9 @@
from acts import asserts
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.wifi.aware import aware_const as aconsts
-from acts_contrib.test_utils.wifi.aware import aware_test_utils as autils
-from acts_contrib.test_utils.wifi.aware.AwareBaseTest import AwareBaseTest
+from acts.test_utils.wifi.aware import aware_const as aconsts
+from acts.test_utils.wifi.aware import aware_test_utils as autils
+from acts.test_utils.wifi.aware.AwareBaseTest import AwareBaseTest
class MatchFilterTest(AwareBaseTest):
diff --git a/acts_tests/tests/google/wifi/aware/functional/MessageTest.py b/acts_tests/tests/google/wifi/aware/functional/MessageTest.py
index 1e013c5..040f4e4 100644
--- a/acts_tests/tests/google/wifi/aware/functional/MessageTest.py
+++ b/acts_tests/tests/google/wifi/aware/functional/MessageTest.py
@@ -19,10 +19,10 @@
from acts import asserts
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.wifi.WifiBaseTest import WifiBaseTest
-from acts_contrib.test_utils.wifi.aware import aware_const as aconsts
-from acts_contrib.test_utils.wifi.aware import aware_test_utils as autils
-from acts_contrib.test_utils.wifi.aware.AwareBaseTest import AwareBaseTest
+from acts.test_utils.wifi.WifiBaseTest import WifiBaseTest
+from acts.test_utils.wifi.aware import aware_const as aconsts
+from acts.test_utils.wifi.aware import aware_test_utils as autils
+from acts.test_utils.wifi.aware.AwareBaseTest import AwareBaseTest
class MessageTest(AwareBaseTest):
diff --git a/acts_tests/tests/google/wifi/aware/functional/NonConcurrencyTest.py b/acts_tests/tests/google/wifi/aware/functional/NonConcurrencyTest.py
index ef8857a..a92552b 100644
--- a/acts_tests/tests/google/wifi/aware/functional/NonConcurrencyTest.py
+++ b/acts_tests/tests/google/wifi/aware/functional/NonConcurrencyTest.py
@@ -20,11 +20,11 @@
from acts import asserts
from acts import utils
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.wifi import wifi_test_utils as wutils
-from acts_contrib.test_utils.wifi import wifi_constants as wconsts
-from acts_contrib.test_utils.wifi.aware import aware_const as aconsts
-from acts_contrib.test_utils.wifi.aware import aware_test_utils as autils
-from acts_contrib.test_utils.wifi.aware.AwareBaseTest import AwareBaseTest
+from acts.test_utils.wifi import wifi_test_utils as wutils
+from acts.test_utils.wifi import wifi_constants as wconsts
+from acts.test_utils.wifi.aware import aware_const as aconsts
+from acts.test_utils.wifi.aware import aware_test_utils as autils
+from acts.test_utils.wifi.aware.AwareBaseTest import AwareBaseTest
# arbitrary timeout for events
EVENT_TIMEOUT = 10
diff --git a/acts_tests/tests/google/wifi/aware/functional/ProtocolsTest.py b/acts_tests/tests/google/wifi/aware/functional/ProtocolsTest.py
index 9bdbebb..15e84ff 100644
--- a/acts_tests/tests/google/wifi/aware/functional/ProtocolsTest.py
+++ b/acts_tests/tests/google/wifi/aware/functional/ProtocolsTest.py
@@ -16,10 +16,10 @@
from acts import asserts
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.net import nsd_const as nconsts
-from acts_contrib.test_utils.wifi.aware import aware_const as aconsts
-from acts_contrib.test_utils.wifi.aware import aware_test_utils as autils
-from acts_contrib.test_utils.wifi.aware.AwareBaseTest import AwareBaseTest
+from acts.test_utils.net import nsd_const as nconsts
+from acts.test_utils.wifi.aware import aware_const as aconsts
+from acts.test_utils.wifi.aware import aware_test_utils as autils
+from acts.test_utils.wifi.aware.AwareBaseTest import AwareBaseTest
class ProtocolsTest(AwareBaseTest):
diff --git a/acts_tests/tests/google/wifi/aware/ota/ServiceIdsTest.py b/acts_tests/tests/google/wifi/aware/ota/ServiceIdsTest.py
index 81d8a49..e29cd71 100644
--- a/acts_tests/tests/google/wifi/aware/ota/ServiceIdsTest.py
+++ b/acts_tests/tests/google/wifi/aware/ota/ServiceIdsTest.py
@@ -17,9 +17,9 @@
import time
from acts import asserts
-from acts_contrib.test_utils.wifi.aware import aware_const as aconsts
-from acts_contrib.test_utils.wifi.aware import aware_test_utils as autils
-from acts_contrib.test_utils.wifi.aware.AwareBaseTest import AwareBaseTest
+from acts.test_utils.wifi.aware import aware_const as aconsts
+from acts.test_utils.wifi.aware import aware_test_utils as autils
+from acts.test_utils.wifi.aware.AwareBaseTest import AwareBaseTest
class ServiceIdsTest(AwareBaseTest):
diff --git a/acts_tests/tests/google/wifi/aware/performance/LatencyTest.py b/acts_tests/tests/google/wifi/aware/performance/LatencyTest.py
index 871602b..8ebff89 100644
--- a/acts_tests/tests/google/wifi/aware/performance/LatencyTest.py
+++ b/acts_tests/tests/google/wifi/aware/performance/LatencyTest.py
@@ -18,10 +18,10 @@
import time
from acts import asserts
-from acts_contrib.test_utils.net import connectivity_const as cconsts
-from acts_contrib.test_utils.wifi.aware import aware_const as aconsts
-from acts_contrib.test_utils.wifi.aware import aware_test_utils as autils
-from acts_contrib.test_utils.wifi.aware.AwareBaseTest import AwareBaseTest
+from acts.test_utils.net import connectivity_const as cconsts
+from acts.test_utils.wifi.aware import aware_const as aconsts
+from acts.test_utils.wifi.aware import aware_test_utils as autils
+from acts.test_utils.wifi.aware.AwareBaseTest import AwareBaseTest
class LatencyTest(AwareBaseTest):
diff --git a/acts_tests/tests/google/wifi/aware/performance/ThroughputTest.py b/acts_tests/tests/google/wifi/aware/performance/ThroughputTest.py
index 7ab4506..2dab276 100644
--- a/acts_tests/tests/google/wifi/aware/performance/ThroughputTest.py
+++ b/acts_tests/tests/google/wifi/aware/performance/ThroughputTest.py
@@ -21,10 +21,10 @@
import time
from acts import asserts
-from acts_contrib.test_utils.net import connectivity_const as cconsts
-from acts_contrib.test_utils.wifi.aware import aware_const as aconsts
-from acts_contrib.test_utils.wifi.aware import aware_test_utils as autils
-from acts_contrib.test_utils.wifi.aware.AwareBaseTest import AwareBaseTest
+from acts.test_utils.net import connectivity_const as cconsts
+from acts.test_utils.wifi.aware import aware_const as aconsts
+from acts.test_utils.wifi.aware import aware_test_utils as autils
+from acts.test_utils.wifi.aware.AwareBaseTest import AwareBaseTest
class ThroughputTest(AwareBaseTest):
diff --git a/acts_tests/tests/google/wifi/aware/performance/WifiAwareRvrTest.py b/acts_tests/tests/google/wifi/aware/performance/WifiAwareRvrTest.py
index add1e12..b1e71e1 100644
--- a/acts_tests/tests/google/wifi/aware/performance/WifiAwareRvrTest.py
+++ b/acts_tests/tests/google/wifi/aware/performance/WifiAwareRvrTest.py
@@ -24,12 +24,12 @@
from acts.controllers import iperf_server as ipf
from acts.controllers import iperf_client as ipc
from acts.metrics.loggers.blackbox import BlackboxMappedMetricLogger
-from acts_contrib.test_utils.wifi import ota_sniffer
-from acts_contrib.test_utils.wifi import wifi_retail_ap as retail_ap
-from acts_contrib.test_utils.wifi import wifi_test_utils as wutils
-from acts_contrib.test_utils.wifi import wifi_performance_test_utils as wputils
-from acts_contrib.test_utils.wifi.aware import aware_const as aconsts
-from acts_contrib.test_utils.wifi.aware import aware_test_utils as autils
+from acts.test_utils.wifi import ota_sniffer
+from acts.test_utils.wifi import wifi_retail_ap as retail_ap
+from acts.test_utils.wifi import wifi_test_utils as wutils
+from acts.test_utils.wifi import wifi_performance_test_utils as wputils
+from acts.test_utils.wifi.aware import aware_const as aconsts
+from acts.test_utils.wifi.aware import aware_test_utils as autils
from WifiRvrTest import WifiRvrTest
AccessPointTuple = collections.namedtuple(('AccessPointTuple'),
diff --git a/acts_tests/tests/google/wifi/aware/stress/DataPathStressTest.py b/acts_tests/tests/google/wifi/aware/stress/DataPathStressTest.py
index 73e2ffa..d2e95df 100644
--- a/acts_tests/tests/google/wifi/aware/stress/DataPathStressTest.py
+++ b/acts_tests/tests/google/wifi/aware/stress/DataPathStressTest.py
@@ -19,10 +19,10 @@
from acts import asserts
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.net import connectivity_const as cconsts
-from acts_contrib.test_utils.wifi.aware import aware_const as aconsts
-from acts_contrib.test_utils.wifi.aware import aware_test_utils as autils
-from acts_contrib.test_utils.wifi.aware.AwareBaseTest import AwareBaseTest
+from acts.test_utils.net import connectivity_const as cconsts
+from acts.test_utils.wifi.aware import aware_const as aconsts
+from acts.test_utils.wifi.aware import aware_test_utils as autils
+from acts.test_utils.wifi.aware.AwareBaseTest import AwareBaseTest
class DataPathStressTest(AwareBaseTest):
diff --git a/acts_tests/tests/google/wifi/aware/stress/DiscoveryStressTest.py b/acts_tests/tests/google/wifi/aware/stress/DiscoveryStressTest.py
index 5643755..55545ea 100644
--- a/acts_tests/tests/google/wifi/aware/stress/DiscoveryStressTest.py
+++ b/acts_tests/tests/google/wifi/aware/stress/DiscoveryStressTest.py
@@ -18,9 +18,9 @@
from acts import asserts
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.wifi.aware import aware_const as aconsts
-from acts_contrib.test_utils.wifi.aware import aware_test_utils as autils
-from acts_contrib.test_utils.wifi.aware.AwareBaseTest import AwareBaseTest
+from acts.test_utils.wifi.aware import aware_const as aconsts
+from acts.test_utils.wifi.aware import aware_test_utils as autils
+from acts.test_utils.wifi.aware.AwareBaseTest import AwareBaseTest
class DiscoveryStressTest(AwareBaseTest):
diff --git a/acts_tests/tests/google/wifi/aware/stress/InfraAssociationStressTest.py b/acts_tests/tests/google/wifi/aware/stress/InfraAssociationStressTest.py
index b37c908..58e2c84 100644
--- a/acts_tests/tests/google/wifi/aware/stress/InfraAssociationStressTest.py
+++ b/acts_tests/tests/google/wifi/aware/stress/InfraAssociationStressTest.py
@@ -18,10 +18,10 @@
import threading
from acts import asserts
-from acts_contrib.test_utils.wifi import wifi_constants as wconsts
-from acts_contrib.test_utils.wifi.aware import aware_const as aconsts
-from acts_contrib.test_utils.wifi.aware import aware_test_utils as autils
-from acts_contrib.test_utils.wifi.aware.AwareBaseTest import AwareBaseTest
+from acts.test_utils.wifi import wifi_constants as wconsts
+from acts.test_utils.wifi.aware import aware_const as aconsts
+from acts.test_utils.wifi.aware import aware_test_utils as autils
+from acts.test_utils.wifi.aware.AwareBaseTest import AwareBaseTest
class InfraAssociationStressTest(AwareBaseTest):
diff --git a/acts_tests/tests/google/wifi/aware/stress/MessagesStressTest.py b/acts_tests/tests/google/wifi/aware/stress/MessagesStressTest.py
index 85fcd26..2d2c514 100644
--- a/acts_tests/tests/google/wifi/aware/stress/MessagesStressTest.py
+++ b/acts_tests/tests/google/wifi/aware/stress/MessagesStressTest.py
@@ -18,9 +18,9 @@
from acts import asserts
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.wifi.aware import aware_const as aconsts
-from acts_contrib.test_utils.wifi.aware import aware_test_utils as autils
-from acts_contrib.test_utils.wifi.aware.AwareBaseTest import AwareBaseTest
+from acts.test_utils.wifi.aware import aware_const as aconsts
+from acts.test_utils.wifi.aware import aware_test_utils as autils
+from acts.test_utils.wifi.aware.AwareBaseTest import AwareBaseTest
KEY_ID = "id"
KEY_TX_OK_COUNT = "tx_ok_count"
diff --git a/acts_tests/tests/google/wifi/p2p/functional/WifiP2pGroupTest.py b/acts_tests/tests/google/wifi/p2p/functional/WifiP2pGroupTest.py
index 9253db5..dd27f21 100644
--- a/acts_tests/tests/google/wifi/p2p/functional/WifiP2pGroupTest.py
+++ b/acts_tests/tests/google/wifi/p2p/functional/WifiP2pGroupTest.py
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-import acts_contrib.test_utils.wifi.wifi_test_utils as wutils
+import acts.test_utils.wifi.wifi_test_utils as wutils
import acts.utils
import time
@@ -22,9 +22,9 @@
from acts import utils
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.wifi.p2p.WifiP2pBaseTest import WifiP2pBaseTest
-from acts_contrib.test_utils.wifi.p2p import wifi_p2p_test_utils as wp2putils
-from acts_contrib.test_utils.wifi.p2p import wifi_p2p_const as p2pconsts
+from acts.test_utils.wifi.p2p.WifiP2pBaseTest import WifiP2pBaseTest
+from acts.test_utils.wifi.p2p import wifi_p2p_test_utils as wp2putils
+from acts.test_utils.wifi.p2p import wifi_p2p_const as p2pconsts
WPS_PBC = wp2putils.WifiP2PEnums.WpsInfo.WIFI_WPS_INFO_PBC
WPS_DISPLAY = wp2putils.WifiP2PEnums.WpsInfo.WIFI_WPS_INFO_DISPLAY
diff --git a/acts_tests/tests/google/wifi/p2p/functional/WifiP2pLocalServiceTest.py b/acts_tests/tests/google/wifi/p2p/functional/WifiP2pLocalServiceTest.py
index 874e295..b043eb9 100644
--- a/acts_tests/tests/google/wifi/p2p/functional/WifiP2pLocalServiceTest.py
+++ b/acts_tests/tests/google/wifi/p2p/functional/WifiP2pLocalServiceTest.py
@@ -17,9 +17,9 @@
import time
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.wifi.p2p.WifiP2pBaseTest import WifiP2pBaseTest
-from acts_contrib.test_utils.wifi.p2p import wifi_p2p_test_utils as wp2putils
-from acts_contrib.test_utils.wifi.p2p import wifi_p2p_const as p2pconsts
+from acts.test_utils.wifi.p2p.WifiP2pBaseTest import WifiP2pBaseTest
+from acts.test_utils.wifi.p2p import wifi_p2p_test_utils as wp2putils
+from acts.test_utils.wifi.p2p import wifi_p2p_const as p2pconsts
class WifiP2pLocalServiceTest(WifiP2pBaseTest):
diff --git a/acts_tests/tests/google/wifi/p2p/functional/WifiP2pManagerTest.py b/acts_tests/tests/google/wifi/p2p/functional/WifiP2pManagerTest.py
index d3aeadf..6bda400 100644
--- a/acts_tests/tests/google/wifi/p2p/functional/WifiP2pManagerTest.py
+++ b/acts_tests/tests/google/wifi/p2p/functional/WifiP2pManagerTest.py
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-import acts_contrib.test_utils.wifi.wifi_test_utils as wutils
+import acts.test_utils.wifi.wifi_test_utils as wutils
import acts.utils
import time
@@ -22,9 +22,9 @@
from acts import utils
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.wifi.p2p.WifiP2pBaseTest import WifiP2pBaseTest
-from acts_contrib.test_utils.wifi.p2p import wifi_p2p_test_utils as wp2putils
-from acts_contrib.test_utils.wifi.p2p import wifi_p2p_const as p2pconsts
+from acts.test_utils.wifi.p2p.WifiP2pBaseTest import WifiP2pBaseTest
+from acts.test_utils.wifi.p2p import wifi_p2p_test_utils as wp2putils
+from acts.test_utils.wifi.p2p import wifi_p2p_const as p2pconsts
WPS_PBC = wp2putils.WifiP2PEnums.WpsInfo.WIFI_WPS_INFO_PBC
WPS_DISPLAY = wp2putils.WifiP2PEnums.WpsInfo.WIFI_WPS_INFO_DISPLAY
diff --git a/acts_tests/tests/google/wifi/p2p/functional/WifiP2pMultiPeersTest.py b/acts_tests/tests/google/wifi/p2p/functional/WifiP2pMultiPeersTest.py
index df57b60..2951be6 100644
--- a/acts_tests/tests/google/wifi/p2p/functional/WifiP2pMultiPeersTest.py
+++ b/acts_tests/tests/google/wifi/p2p/functional/WifiP2pMultiPeersTest.py
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-import acts_contrib.test_utils.wifi.wifi_test_utils as wutils
+import acts.test_utils.wifi.wifi_test_utils as wutils
import acts.utils
import time
@@ -22,10 +22,10 @@
from acts import utils
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.wifi import wifi_test_utils as wutils
-from acts_contrib.test_utils.wifi.p2p.WifiP2pBaseTest import WifiP2pBaseTest
-from acts_contrib.test_utils.wifi.p2p import wifi_p2p_test_utils as wp2putils
-from acts_contrib.test_utils.wifi.p2p import wifi_p2p_const as p2pconsts
+from acts.test_utils.wifi import wifi_test_utils as wutils
+from acts.test_utils.wifi.p2p.WifiP2pBaseTest import WifiP2pBaseTest
+from acts.test_utils.wifi.p2p import wifi_p2p_test_utils as wp2putils
+from acts.test_utils.wifi.p2p import wifi_p2p_const as p2pconsts
WPS_PBC = wp2putils.WifiP2PEnums.WpsInfo.WIFI_WPS_INFO_PBC
WPS_DISPLAY = wp2putils.WifiP2PEnums.WpsInfo.WIFI_WPS_INFO_DISPLAY
diff --git a/acts_tests/tests/google/wifi/p2p/functional/WifiP2pSnifferTest.py b/acts_tests/tests/google/wifi/p2p/functional/WifiP2pSnifferTest.py
index fa4f53f..2db5273 100644
--- a/acts_tests/tests/google/wifi/p2p/functional/WifiP2pSnifferTest.py
+++ b/acts_tests/tests/google/wifi/p2p/functional/WifiP2pSnifferTest.py
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-import acts_contrib.test_utils.wifi.wifi_test_utils as wutils
+import acts.test_utils.wifi.wifi_test_utils as wutils
import acts.utils
import time
import re
@@ -23,9 +23,9 @@
from acts import utils
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.wifi.p2p.WifiP2pBaseTest import WifiP2pBaseTest
-from acts_contrib.test_utils.wifi.p2p import wifi_p2p_test_utils as wp2putils
-from acts_contrib.test_utils.wifi.p2p import wifi_p2p_const as p2pconsts
+from acts.test_utils.wifi.p2p.WifiP2pBaseTest import WifiP2pBaseTest
+from acts.test_utils.wifi.p2p import wifi_p2p_test_utils as wp2putils
+from acts.test_utils.wifi.p2p import wifi_p2p_const as p2pconsts
from acts.controllers.ap_lib.hostapd_constants import BAND_2G
from scapy.all import *
diff --git a/acts_tests/tests/google/wifi/p2p/performance/WifiP2pRvrTest.py b/acts_tests/tests/google/wifi/p2p/performance/WifiP2pRvrTest.py
index c4b2dc6..85b9a0d 100644
--- a/acts_tests/tests/google/wifi/p2p/performance/WifiP2pRvrTest.py
+++ b/acts_tests/tests/google/wifi/p2p/performance/WifiP2pRvrTest.py
@@ -25,12 +25,12 @@
from acts.controllers import iperf_server as ipf
from acts.controllers import iperf_client as ipc
from acts.metrics.loggers.blackbox import BlackboxMappedMetricLogger
-from acts_contrib.test_utils.wifi import ota_sniffer
-from acts_contrib.test_utils.wifi import wifi_retail_ap as retail_ap
-from acts_contrib.test_utils.wifi import wifi_test_utils as wutils
-from acts_contrib.test_utils.wifi import wifi_performance_test_utils as wputils
-from acts_contrib.test_utils.wifi.p2p import wifi_p2p_const as p2pconsts
-from acts_contrib.test_utils.wifi.p2p import wifi_p2p_test_utils as wp2putils
+from acts.test_utils.wifi import ota_sniffer
+from acts.test_utils.wifi import wifi_retail_ap as retail_ap
+from acts.test_utils.wifi import wifi_test_utils as wutils
+from acts.test_utils.wifi import wifi_performance_test_utils as wputils
+from acts.test_utils.wifi.p2p import wifi_p2p_const as p2pconsts
+from acts.test_utils.wifi.p2p import wifi_p2p_test_utils as wp2putils
from WifiRvrTest import WifiRvrTest
AccessPointTuple = collections.namedtuple(('AccessPointTuple'),
diff --git a/acts_tests/tests/google/wifi/rtt/functional/AwareDiscoveryWithRangingTest.py b/acts_tests/tests/google/wifi/rtt/functional/AwareDiscoveryWithRangingTest.py
index 5f3f91b..da0ba4b 100644
--- a/acts_tests/tests/google/wifi/rtt/functional/AwareDiscoveryWithRangingTest.py
+++ b/acts_tests/tests/google/wifi/rtt/functional/AwareDiscoveryWithRangingTest.py
@@ -19,13 +19,13 @@
from acts import asserts
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.net import connectivity_const as cconsts
-from acts_contrib.test_utils.wifi.aware import aware_const as aconsts
-from acts_contrib.test_utils.wifi.aware import aware_test_utils as autils
-from acts_contrib.test_utils.wifi.aware.AwareBaseTest import AwareBaseTest
-from acts_contrib.test_utils.wifi.rtt import rtt_const as rconsts
-from acts_contrib.test_utils.wifi.rtt import rtt_test_utils as rutils
-from acts_contrib.test_utils.wifi.rtt.RttBaseTest import RttBaseTest
+from acts.test_utils.net import connectivity_const as cconsts
+from acts.test_utils.wifi.aware import aware_const as aconsts
+from acts.test_utils.wifi.aware import aware_test_utils as autils
+from acts.test_utils.wifi.aware.AwareBaseTest import AwareBaseTest
+from acts.test_utils.wifi.rtt import rtt_const as rconsts
+from acts.test_utils.wifi.rtt import rtt_test_utils as rutils
+from acts.test_utils.wifi.rtt.RttBaseTest import RttBaseTest
class AwareDiscoveryWithRangingTest(AwareBaseTest, RttBaseTest):
diff --git a/acts_tests/tests/google/wifi/rtt/functional/RangeApMiscTest.py b/acts_tests/tests/google/wifi/rtt/functional/RangeApMiscTest.py
index b21ef55..c68ca92 100644
--- a/acts_tests/tests/google/wifi/rtt/functional/RangeApMiscTest.py
+++ b/acts_tests/tests/google/wifi/rtt/functional/RangeApMiscTest.py
@@ -15,10 +15,10 @@
# limitations under the License.
from acts import asserts
-from acts_contrib.test_utils.wifi import wifi_test_utils as wutils
-from acts_contrib.test_utils.wifi.rtt import rtt_const as rconsts
-from acts_contrib.test_utils.wifi.rtt import rtt_test_utils as rutils
-from acts_contrib.test_utils.wifi.rtt.RttBaseTest import RttBaseTest
+from acts.test_utils.wifi import wifi_test_utils as wutils
+from acts.test_utils.wifi.rtt import rtt_const as rconsts
+from acts.test_utils.wifi.rtt import rtt_test_utils as rutils
+from acts.test_utils.wifi.rtt.RttBaseTest import RttBaseTest
class RangeApMiscTest(RttBaseTest):
diff --git a/acts_tests/tests/google/wifi/rtt/functional/RangeApNonSupporting11McTest.py b/acts_tests/tests/google/wifi/rtt/functional/RangeApNonSupporting11McTest.py
index cdb1293..a40647b 100644
--- a/acts_tests/tests/google/wifi/rtt/functional/RangeApNonSupporting11McTest.py
+++ b/acts_tests/tests/google/wifi/rtt/functional/RangeApNonSupporting11McTest.py
@@ -16,10 +16,10 @@
from acts import asserts
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.wifi.WifiBaseTest import WifiBaseTest
-from acts_contrib.test_utils.wifi.rtt import rtt_const as rconsts
-from acts_contrib.test_utils.wifi.rtt import rtt_test_utils as rutils
-from acts_contrib.test_utils.wifi.rtt.RttBaseTest import RttBaseTest
+from acts.test_utils.wifi.WifiBaseTest import WifiBaseTest
+from acts.test_utils.wifi.rtt import rtt_const as rconsts
+from acts.test_utils.wifi.rtt import rtt_test_utils as rutils
+from acts.test_utils.wifi.rtt.RttBaseTest import RttBaseTest
class RangeApNonSupporting11McTest(RttBaseTest, WifiBaseTest):
diff --git a/acts_tests/tests/google/wifi/rtt/functional/RangeApSupporting11McTest.py b/acts_tests/tests/google/wifi/rtt/functional/RangeApSupporting11McTest.py
index 020f6e2..c218898 100644
--- a/acts_tests/tests/google/wifi/rtt/functional/RangeApSupporting11McTest.py
+++ b/acts_tests/tests/google/wifi/rtt/functional/RangeApSupporting11McTest.py
@@ -19,11 +19,11 @@
from acts import asserts
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.tel.tel_test_utils import WIFI_CONFIG_APBAND_5G
-from acts_contrib.test_utils.wifi import wifi_test_utils as wutils
-from acts_contrib.test_utils.wifi.rtt import rtt_const as rconsts
-from acts_contrib.test_utils.wifi.rtt import rtt_test_utils as rutils
-from acts_contrib.test_utils.wifi.rtt.RttBaseTest import RttBaseTest
+from acts.test_utils.tel.tel_test_utils import WIFI_CONFIG_APBAND_5G
+from acts.test_utils.wifi import wifi_test_utils as wutils
+from acts.test_utils.wifi.rtt import rtt_const as rconsts
+from acts.test_utils.wifi.rtt import rtt_test_utils as rutils
+from acts.test_utils.wifi.rtt.RttBaseTest import RttBaseTest
class RangeApSupporting11McTest(RttBaseTest):
diff --git a/acts_tests/tests/google/wifi/rtt/functional/RangeAwareTest.py b/acts_tests/tests/google/wifi/rtt/functional/RangeAwareTest.py
index 1051fc4..a3262b1 100644
--- a/acts_tests/tests/google/wifi/rtt/functional/RangeAwareTest.py
+++ b/acts_tests/tests/google/wifi/rtt/functional/RangeAwareTest.py
@@ -19,12 +19,12 @@
from acts import asserts
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.wifi.aware import aware_const as aconsts
-from acts_contrib.test_utils.wifi.aware import aware_test_utils as autils
-from acts_contrib.test_utils.wifi.aware.AwareBaseTest import AwareBaseTest
-from acts_contrib.test_utils.wifi.rtt import rtt_const as rconsts
-from acts_contrib.test_utils.wifi.rtt import rtt_test_utils as rutils
-from acts_contrib.test_utils.wifi.rtt.RttBaseTest import RttBaseTest
+from acts.test_utils.wifi.aware import aware_const as aconsts
+from acts.test_utils.wifi.aware import aware_test_utils as autils
+from acts.test_utils.wifi.aware.AwareBaseTest import AwareBaseTest
+from acts.test_utils.wifi.rtt import rtt_const as rconsts
+from acts.test_utils.wifi.rtt import rtt_test_utils as rutils
+from acts.test_utils.wifi.rtt.RttBaseTest import RttBaseTest
class RangeAwareTest(AwareBaseTest, RttBaseTest):
diff --git a/acts_tests/tests/google/wifi/rtt/functional/RangeSoftApTest.py b/acts_tests/tests/google/wifi/rtt/functional/RangeSoftApTest.py
index 6f7d5fe..c23b5b0 100644
--- a/acts_tests/tests/google/wifi/rtt/functional/RangeSoftApTest.py
+++ b/acts_tests/tests/google/wifi/rtt/functional/RangeSoftApTest.py
@@ -16,11 +16,11 @@
from acts import asserts
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.tel.tel_test_utils import WIFI_CONFIG_APBAND_5G
-from acts_contrib.test_utils.wifi import wifi_test_utils as wutils
-from acts_contrib.test_utils.wifi.rtt import rtt_const as rconsts
-from acts_contrib.test_utils.wifi.rtt import rtt_test_utils as rutils
-from acts_contrib.test_utils.wifi.rtt.RttBaseTest import RttBaseTest
+from acts.test_utils.tel.tel_test_utils import WIFI_CONFIG_APBAND_5G
+from acts.test_utils.wifi import wifi_test_utils as wutils
+from acts.test_utils.wifi.rtt import rtt_const as rconsts
+from acts.test_utils.wifi.rtt import rtt_test_utils as rutils
+from acts.test_utils.wifi.rtt.RttBaseTest import RttBaseTest
class RangeSoftApTest(RttBaseTest):
diff --git a/acts_tests/tests/google/wifi/rtt/functional/RttDisableTest.py b/acts_tests/tests/google/wifi/rtt/functional/RttDisableTest.py
index f3b39a5..703efac 100644
--- a/acts_tests/tests/google/wifi/rtt/functional/RttDisableTest.py
+++ b/acts_tests/tests/google/wifi/rtt/functional/RttDisableTest.py
@@ -17,10 +17,10 @@
from acts import asserts
from acts import utils
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.wifi.rtt import rtt_const as rconsts
-from acts_contrib.test_utils.wifi.rtt import rtt_test_utils as rutils
-from acts_contrib.test_utils.wifi.rtt.RttBaseTest import RttBaseTest
-from acts_contrib.test_utils.wifi.WifiBaseTest import WifiBaseTest
+from acts.test_utils.wifi.rtt import rtt_const as rconsts
+from acts.test_utils.wifi.rtt import rtt_test_utils as rutils
+from acts.test_utils.wifi.rtt.RttBaseTest import RttBaseTest
+from acts.test_utils.wifi.WifiBaseTest import WifiBaseTest
class RttDisableTest(WifiBaseTest, RttBaseTest):
diff --git a/acts_tests/tests/google/wifi/rtt/functional/RttRequestManagementTest.py b/acts_tests/tests/google/wifi/rtt/functional/RttRequestManagementTest.py
index f7c1f91..c91521d 100644
--- a/acts_tests/tests/google/wifi/rtt/functional/RttRequestManagementTest.py
+++ b/acts_tests/tests/google/wifi/rtt/functional/RttRequestManagementTest.py
@@ -19,9 +19,9 @@
from acts import asserts
from acts.test_decorators import test_tracker_info
-from acts_contrib.test_utils.wifi.rtt import rtt_const as rconsts
-from acts_contrib.test_utils.wifi.rtt import rtt_test_utils as rutils
-from acts_contrib.test_utils.wifi.rtt.RttBaseTest import RttBaseTest
+from acts.test_utils.wifi.rtt import rtt_const as rconsts
+from acts.test_utils.wifi.rtt import rtt_test_utils as rutils
+from acts.test_utils.wifi.rtt.RttBaseTest import RttBaseTest
class RttRequestManagementTest(RttBaseTest):
diff --git a/acts_tests/tests/google/wifi/rtt/stress/StressRangeApTest.py b/acts_tests/tests/google/wifi/rtt/stress/StressRangeApTest.py
index d88fd26..d0e9fe9 100644
--- a/acts_tests/tests/google/wifi/rtt/stress/StressRangeApTest.py
+++ b/acts_tests/tests/google/wifi/rtt/stress/StressRangeApTest.py
@@ -16,8 +16,8 @@
from acts import asserts
from acts.base_test import BaseTestClass
-from acts_contrib.test_utils.wifi.rtt import rtt_test_utils as rutils
-from acts_contrib.test_utils.wifi.rtt.RttBaseTest import RttBaseTest
+from acts.test_utils.wifi.rtt import rtt_test_utils as rutils
+from acts.test_utils.wifi.rtt.RttBaseTest import RttBaseTest
class StressRangeApTest(RttBaseTest):
diff --git a/acts_tests/tests/google/wifi/rtt/stress/StressRangeAwareTest.py b/acts_tests/tests/google/wifi/rtt/stress/StressRangeAwareTest.py
index b03ab5b..ccf8b9d 100644
--- a/acts_tests/tests/google/wifi/rtt/stress/StressRangeAwareTest.py
+++ b/acts_tests/tests/google/wifi/rtt/stress/StressRangeAwareTest.py
@@ -18,12 +18,12 @@
import time
from acts import asserts
-from acts_contrib.test_utils.wifi.aware import aware_const as aconsts
-from acts_contrib.test_utils.wifi.aware import aware_test_utils as autils
-from acts_contrib.test_utils.wifi.aware.AwareBaseTest import AwareBaseTest
-from acts_contrib.test_utils.wifi.rtt import rtt_const as rconsts
-from acts_contrib.test_utils.wifi.rtt import rtt_test_utils as rutils
-from acts_contrib.test_utils.wifi.rtt.RttBaseTest import RttBaseTest
+from acts.test_utils.wifi.aware import aware_const as aconsts
+from acts.test_utils.wifi.aware import aware_test_utils as autils
+from acts.test_utils.wifi.aware.AwareBaseTest import AwareBaseTest
+from acts.test_utils.wifi.rtt import rtt_const as rconsts
+from acts.test_utils.wifi.rtt import rtt_test_utils as rutils
+from acts.test_utils.wifi.rtt.RttBaseTest import RttBaseTest
class StressRangeAwareTest(AwareBaseTest, RttBaseTest):