summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2020-08-05 02:04:52 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2020-08-05 02:04:52 +0000
commitc4886fba3091cfdc028014d5ab7c7fe7af231c31 (patch)
treed4a5b4d07579ccc138d2bd196f7d370e93ee7265
parentffe7a7fe6ba82dad8cfb1bd29c3b5fffd3ed09cd (diff)
parent21564dec6755ec73cfa3ecdc752bf26d681ad53f (diff)
downloadconnectivity-c4886fba3091cfdc028014d5ab7c7fe7af231c31.tar.gz
Snap for 6736718 from 21564dec6755ec73cfa3ecdc752bf26d681ad53f to sc-release
Change-Id: I6c6d57279c4bee4c52452a528bdb08a57152bd56
-rw-r--r--UID/AndroidManifest.xml2
-rw-r--r--sl4n/facades/bluetooth/bt_binder_facade.h2
-rw-r--r--sl4n/facades/wifi/wifi_facade.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/UID/AndroidManifest.xml b/UID/AndroidManifest.xml
index 9dc2680..73233eb 100644
--- a/UID/AndroidManifest.xml
+++ b/UID/AndroidManifest.xml
@@ -33,7 +33,7 @@
android:allowBackup="true"
android:label="@string/app_name"
android:theme="@style/AppTheme" >
- <!-- Dummy activity -->
+ <!-- Test activity -->
<activity
android:name="com.android.tests.connectivity.uid.ConnectivityTestActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
diff --git a/sl4n/facades/bluetooth/bt_binder_facade.h b/sl4n/facades/bluetooth/bt_binder_facade.h
index e06cd75..65ece71 100644
--- a/sl4n/facades/bluetooth/bt_binder_facade.h
+++ b/sl4n/facades/bluetooth/bt_binder_facade.h
@@ -26,7 +26,7 @@
// representing the pass/fail value of the function. The functions check to see
// if the API call is actually possible. If it is the function's tuple will
// contain the actual result and an integer that indicates the value passed. If
-// the function is not possible then there will be a dummy return value in the
+// the function is not possible then there will be a mock return value in the
// first position of the tuple and the second value in the tuple indicates the
// value failed. Therefore it is up to the function to decide whether the
// expected api call is actually possible before calling it.
diff --git a/sl4n/facades/wifi/wifi_facade.h b/sl4n/facades/wifi/wifi_facade.h
index c028c5b..c68771b 100644
--- a/sl4n/facades/wifi/wifi_facade.h
+++ b/sl4n/facades/wifi/wifi_facade.h
@@ -22,7 +22,7 @@
// WifiFacade provides simple wrappers to call Wi-Fi HAL APIs.
//
// Each public function returns a tuple: <result, code>, where:
-// result: result of HAL API or a dummy value (of the correct type)
+// result: result of HAL API or a mock value (of the correct type)
// on failure.
// code: sl4n_error_codes::kPassInt or sl4n_error_codes::kFailInt on
// success or failure respectively.