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

Commit 3a0bf2d4 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

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



Change-Id: I0d5379beb5edc28481d48ad08e5d6d2ee8bac47d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7f9cd924 fb3de263

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() {