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

Commit 48330afd authored by Treehugger Robot's avatar Treehugger Robot 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: 5db4dc6c am: fb3de263 am: 3a0bf2d4

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



Change-Id: If57056d0feab5c291b85f38c080e100acae90b3a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 216bc8ea 3a0bf2d4

media/tests/MediaRouter/src/com/android/mediaroutertest/MediaRouter2ManagerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -918,7 +918,7 @@ public class MediaRouter2ManagerTest { 
        CountDownLatch addedLatch = new CountDownLatch(1);

        CountDownLatch preferenceLatch = new CountDownLatch(1);



        // A dummy callback is required to send route feature info.

        // A placeholder callback is required to send route feature info.

        RouteCallback routeCallback = new RouteCallback() {};

        MediaRouter2Manager.Callback managerCallback =

                new MediaRouter2Manager.Callback() {