Commit 63c32977 authored Aug 22, 2023 by Chan Kim Committed by Automerger Merge Worker Aug 22, 2023

Merge "Update language to comply with Android's inclusive language guidance"...

Merge "Update language to comply with Android's inclusive language guidance" into main am: d9546e93

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2720061

Change-Id: I116cd9c687f8c94be9d21f304a5a72fc4bbdc2ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

services/tests/servicestests/utils/com/android/server/testutils/TestHandler.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -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));
		}