Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 75439875 authored by Chan Kim's avatar Chan Kim Committed by Automerger Merge Worker
Browse files

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 am: 63c32977

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



Change-Id: I116079032174ac26ee4cb1d2ae28154d35666d13
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ab8eef6c 63c32977

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -82,7 +82,7 @@ public class TestHandler extends Handler { 
            uptimeMillis = uptimeMillis - SystemClock.uptimeMillis() + mClock.getAsLong();

            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)

        return super.sendMessageAtTime(msg, Long.MAX_VALUE)

                && mMessages.add(new MsgInfo(Message.obtain(msg), uptimeMillis, mMessageCount));

                && mMessages.add(new MsgInfo(Message.obtain(msg), uptimeMillis, mMessageCount));

    }

    }