| commit | 48330afd8b6361af75d60986cd97f403a56c9b7f | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Tue Aug 22 10:46:21 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 22 10:46:21 2023 +0000 |
| tree | 635ca3f17d89830f4c4a00e00cf9098fb6bdcac2 | |
| parent | 216bc8eaad371747c759c22b80755cfb7a8084b8 [diff] | |
| parent | 3a0bf2d46af5a1a3f20c1e4d8dbbf5094db39aff [diff] |
Merge "Update language to comply with Android's inclusive language guidance" into main am: 5db4dc6c58 am: fb3de26341 am: 3a0bf2d46a Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2720056 Change-Id: If57056d0feab5c291b85f38c080e100acae90b3a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/media/tests/MediaRouter/src/com/android/mediaroutertest/MediaRouter2ManagerTest.java b/media/tests/MediaRouter/src/com/android/mediaroutertest/MediaRouter2ManagerTest.java index 4193ffa..3d448a8 100644 --- a/media/tests/MediaRouter/src/com/android/mediaroutertest/MediaRouter2ManagerTest.java +++ b/media/tests/MediaRouter/src/com/android/mediaroutertest/MediaRouter2ManagerTest.java
@@ -918,7 +918,7 @@ 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() {