summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Chan Kim <kimchan@google.com> 2023-08-23 00:59:55 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-08-23 00:59:55 +0000
commitfd9e6e3efebc697dced732cb1d4c3245d5508f9c (patch)
tree659c377bd2bfa65be3c5bbe824241812635006f3
parent162f4f23852b83a54cb05324cd0acda083d243ca (diff)
parentf5078ee64595edeb305fd964655a7e6bad347caf (diff)
Merge "Update language to comply with Android's inclusive language guidance" into main am: 0698cb8b64 am: fc3617d1e1 am: f5078ee645
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2720065 Change-Id: I5d8200f8ee1cc6b2106e98b74045bbc173dc6299 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--tests/PlatformCompatGating/src/com/android/compat/testing/DummyApi.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/PlatformCompatGating/src/com/android/compat/testing/DummyApi.java b/tests/PlatformCompatGating/src/com/android/compat/testing/DummyApi.java
index 731be8e3d9f0..a77950fe4a2d 100644
--- a/tests/PlatformCompatGating/src/com/android/compat/testing/DummyApi.java
+++ b/tests/PlatformCompatGating/src/com/android/compat/testing/DummyApi.java
@@ -24,7 +24,7 @@ import android.os.ServiceManager;
import com.android.internal.compat.IPlatformCompat;
/**
- * This is a dummy API to test gating
+ * This is a placeholder API to test gating
*
* @hide
*/
@@ -36,7 +36,7 @@ public class DummyApi {
public static final long CHANGE_SYSTEM_SERVER = 666016;
/**
- * Dummy method
+ * Placeholder method
* @return "A" if change is enabled, "B" otherwise.
*/
public static String dummyFunc() {
@@ -47,7 +47,7 @@ public class DummyApi {
}
/**
- * Dummy combined method
+ * Placeholder combined method
* @return "0" if {@link CHANGE_ID_1} is disabled and {@link CHANGE_ID_2} is disabled,
"1" if {@link CHANGE_ID_1} is disabled and {@link CHANGE_ID_2} is enabled,
"2" if {@link CHANGE_ID_1} is enabled and {@link CHANGE_ID_2} is disabled,
@@ -68,7 +68,7 @@ public class DummyApi {
}
/**
- * Dummy api using system server API.
+ * Placeholder api using system server API.
*/
public static boolean dummySystemServer(Context context) {
IPlatformCompat platformCompat = IPlatformCompat.Stub