diff options
| author | 2023-08-22 11:13:14 +0000 | |
|---|---|---|
| committer | 2023-08-22 11:13:14 +0000 | |
| commit | da441ebdaad954ed98052b3dc454ce0686376b8d (patch) | |
| tree | 08a62866a976ed7a44de547d0c913575f0f07782 | |
| parent | a98bd9a2839b44fe87352f5f465eab4a72bc2c5d (diff) | |
| parent | 48330afd8b6361af75d60986cd97f403a56c9b7f (diff) | |
Merge "Update language to comply with Android's inclusive language guidance" into main am: 5db4dc6c58 am: fb3de26341 am: 3a0bf2d46a am: 48330afd8b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2720056
Change-Id: I931149d63b54f190accd2977962d5dfcd13a62ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | media/tests/MediaRouter/src/com/android/mediaroutertest/MediaRouter2ManagerTest.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/tests/MediaRouter/src/com/android/mediaroutertest/MediaRouter2ManagerTest.java b/media/tests/MediaRouter/src/com/android/mediaroutertest/MediaRouter2ManagerTest.java index 4193ffad5a0a..3d448a80aa5a 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 @@ 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() { |