From 71133463f7a260ab05952252af9a6551352716c2 Mon Sep 17 00:00:00 2001 From: Gyumin Sim Date: Fri, 11 Sep 2020 01:38:21 +0000 Subject: [PATCH] Comply with inclusive language guidance in media session and browser See https://source.android.com/setup/contribute/respectful-code for reference. Bug: 161896447 Change-Id: I9c48b7d835821691d37f4f1c866569071feb8cb7 Test: N/A --- apex/media/framework/java/android/media/MediaController2.java | 1 - media/java/android/media/browse/MediaBrowser.java | 2 +- .../core/java/com/android/server/media/MediaSessionStack.java | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/apex/media/framework/java/android/media/MediaController2.java b/apex/media/framework/java/android/media/MediaController2.java index d059c670ccb66..159e8e551d110 100644 --- a/apex/media/framework/java/android/media/MediaController2.java +++ b/apex/media/framework/java/android/media/MediaController2.java @@ -594,7 +594,6 @@ public class MediaController2 implements AutoCloseable { if (DEBUG) { Log.d(TAG, "onServiceConnected " + name + " " + this); } - // Sanity check if (!mSessionToken.getPackageName().equals(name.getPackageName())) { Log.wtf(TAG, "Expected connection to " + mSessionToken.getPackageName() + " but is connected to " + name); diff --git a/media/java/android/media/browse/MediaBrowser.java b/media/java/android/media/browse/MediaBrowser.java index 3c2be5f93e307..3d27e4b591fdf 100644 --- a/media/java/android/media/browse/MediaBrowser.java +++ b/media/java/android/media/browse/MediaBrowser.java @@ -211,7 +211,7 @@ public final class MediaBrowser { public void disconnect() { // It's ok to call this any state, because allowing this lets apps not have // to check isConnected() unnecessarily. They won't appreciate the extra - // assertions for this. We do everything we can here to go back to a sane state. + // assertions for this. We do everything we can here to go back to a valid state. mState = CONNECT_STATE_DISCONNECTING; mHandler.post(new Runnable() { @Override diff --git a/services/core/java/com/android/server/media/MediaSessionStack.java b/services/core/java/com/android/server/media/MediaSessionStack.java index b678c8962a219..f3acf6e2758b8 100644 --- a/services/core/java/com/android/server/media/MediaSessionStack.java +++ b/services/core/java/com/android/server/media/MediaSessionStack.java @@ -103,7 +103,7 @@ class MediaSessionStack { if (mMediaButtonSession == record) { // When the media button session is removed, nullify the media button session and do not // search for the alternative media session within the app. It's because the alternative - // media session might be a dummy which isn't able to handle the media key events. + // media session might be a fake which isn't able to handle the media key events. // TODO(b/154456172): Make this decision unaltered by non-media app's playback. updateMediaButtonSession(null); }