Merge "[AWARE] Rename configuration variable with "aware" prefix" into oc-mr1-dev
diff --git a/acts/framework/acts/test_utils/wifi/aware/AwareBaseTest.py b/acts/framework/acts/test_utils/wifi/aware/AwareBaseTest.py
index 92b758e..a911606 100644
--- a/acts/framework/acts/test_utils/wifi/aware/AwareBaseTest.py
+++ b/acts/framework/acts/test_utils/wifi/aware/AwareBaseTest.py
@@ -34,7 +34,7 @@
   device_startup_offset = 2
 
   def setup_test(self):
-    required_params = ("default_power_mode", )
+    required_params = ("aware_default_power_mode", )
     self.unpack_userparams(required_params)
 
     for ad in self.android_devices:
@@ -83,13 +83,13 @@
   def set_power_mode_parameters(self, ad):
     """Set the power configuration DW parameters for the device based on any
     configuration overrides (if provided)"""
-    if self.default_power_mode == "INTERACTIVE":
+    if self.aware_default_power_mode == "INTERACTIVE":
       autils.config_dw_high_power(ad)
-    elif self.default_power_mode == "NON_INTERACTIVE":
+    elif self.aware_default_power_mode == "NON_INTERACTIVE":
       autils.config_dw_low_power(ad)
     else:
       asserts.assert_false(
-          "The 'default_power_mode' configuration must be INTERACTIVE or "
+          "The 'aware_default_power_mode' configuration must be INTERACTIVE or "
           "NON_INTERACTIVE"
       )
 
diff --git a/acts/tests/google/wifi/aware/README.md b/acts/tests/google/wifi/aware/README.md
index 3762049..11a8296 100644
--- a/acts/tests/google/wifi/aware/README.md
+++ b/acts/tests/google/wifi/aware/README.md
@@ -42,7 +42,7 @@
 single device while others use 2 devices. In addition, the configurations
 define the following key to configure the test:
 
-* **default_power_mode**: The power mode in which to run all tests. Options
+* **aware_default_power_mode**: The power mode in which to run all tests. Options
 are `INTERACTIVE` and `NON_INTERACTIVE`.
 
 The following configurations are provided:
diff --git a/acts/tests/google/wifi/aware/config/wifi_aware.json b/acts/tests/google/wifi/aware/config/wifi_aware.json
index 7f384ef..97323fc 100644
--- a/acts/tests/google/wifi/aware/config/wifi_aware.json
+++ b/acts/tests/google/wifi/aware/config/wifi_aware.json
@@ -11,5 +11,5 @@
     "logpath": "~/logs",
     "testpaths": ["./tools/test/connectivity/acts/tests/google/wifi"],
     "adb_logcat_param": "-b all",
-    "default_power_mode": "INTERACTIVE"
+    "aware_default_power_mode": "INTERACTIVE"
 }
diff --git a/acts/tests/google/wifi/aware/config/wifi_aware_non_interactive.json b/acts/tests/google/wifi/aware/config/wifi_aware_non_interactive.json
index 16e26b9..f2e6e79 100644
--- a/acts/tests/google/wifi/aware/config/wifi_aware_non_interactive.json
+++ b/acts/tests/google/wifi/aware/config/wifi_aware_non_interactive.json
@@ -11,5 +11,5 @@
     "logpath": "~/logs",
     "testpaths": ["./tools/test/connectivity/acts/tests/google/wifi"],
     "adb_logcat_param": "-b all",
-    "default_power_mode": "NON_INTERACTIVE"
+    "aware_default_power_mode": "NON_INTERACTIVE"
 }