summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Chan Kim <kimchan@google.com> 2023-08-22 02:24:04 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-08-22 02:24:04 +0000
commita70ab176b07cf73ca1883db8b4ad78cfcc84f4cf (patch)
treebf644e20a9bfe4ca4c55bdd508f929d9a35e1622
parent35d76def14f4e5cc9bd9c2ab9d83f53b6a9edde7 (diff)
parent0959f4fe0a93fe2e1712417c8a02161762477638 (diff)
Merge "Update language to comply with Android's inclusive language guidance" into main am: d9546e930e am: 63c32977c2 am: 7543987540 am: 11b0672eda am: 0959f4fe0a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2720061 Change-Id: I1e10918daba8eca9785975869c13a2bdc5a49d15 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--services/tests/servicestests/utils/com/android/server/testutils/TestHandler.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/tests/servicestests/utils/com/android/server/testutils/TestHandler.java b/services/tests/servicestests/utils/com/android/server/testutils/TestHandler.java
index 22d383a84177..fc5213cba2e2 100644
--- a/services/tests/servicestests/utils/com/android/server/testutils/TestHandler.java
+++ b/services/tests/servicestests/utils/com/android/server/testutils/TestHandler.java
@@ -82,7 +82,7 @@ public class TestHandler extends Handler {
uptimeMillis = uptimeMillis - SystemClock.uptimeMillis() + mClock.getAsLong();
}
- // post a dummy queue entry to keep track of message removal
+ // post a sentinel queue entry to keep track of message removal
return super.sendMessageAtTime(msg, Long.MAX_VALUE)
&& mMessages.add(new MsgInfo(Message.obtain(msg), uptimeMillis, mMessageCount));
}