summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2023-08-22 10:10:34 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-08-22 10:10:34 +0000
commit3a0bf2d46af5a1a3f20c1e4d8dbbf5094db39aff (patch)
tree6c1c6496cb99c6013073e0bd797d974f51bce838
parent7f9cd924956a9f0adba0067687890f69a63c4053 (diff)
parentfb3de263416665c357c2a3e104e7a9463a47c754 (diff)
Merge "Update language to comply with Android's inclusive language guidance" into main am: 5db4dc6c58 am: fb3de26341
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2720056 Change-Id: I0d5379beb5edc28481d48ad08e5d6d2ee8bac47d 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.java2
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() {