Merge "Merge "Comply with inclusive language guidance in media session and browser" am: 93a807bcf7 am: 75fa27a100 am: aa1edf9312 am: 0a0c1ce8bb am: 4d52c486fb"

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 d059c670ccb6..159e8e551d11 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 029e61492b6d..011e835e02ec 100644
--- a/media/java/android/media/browse/MediaBrowser.java
+++ b/media/java/android/media/browse/MediaBrowser.java
@@ -210,7 +210,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 d9b5b6d41c11..f15e22f92cad 100644
--- a/services/core/java/com/android/server/media/MediaSessionStack.java
+++ b/services/core/java/com/android/server/media/MediaSessionStack.java
@@ -101,7 +101,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);
         }