Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 71133463 authored by Gyumin Sim's avatar Gyumin Sim
Browse files

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
parent bece5974

apex/media/framework/java/android/media/MediaController2.java

+0 −1
Original line number Original line Diff line number Diff line
@@ -594,7 +594,6 @@ public class MediaController2 implements AutoCloseable { 
                if (DEBUG) {

                if (DEBUG) {

                    Log.d(TAG, "onServiceConnected " + name + " " + this);

                    Log.d(TAG, "onServiceConnected " + name + " " + this);

                }

                }

                // Sanity check

                if (!mSessionToken.getPackageName().equals(name.getPackageName())) {

                if (!mSessionToken.getPackageName().equals(name.getPackageName())) {

                    Log.wtf(TAG, "Expected connection to " + mSessionToken.getPackageName()

                    Log.wtf(TAG, "Expected connection to " + mSessionToken.getPackageName()

                            + " but is connected to " + name);

                            + " but is connected to " + name);

media/java/android/media/browse/MediaBrowser.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -211,7 +211,7 @@ public final class MediaBrowser { 
    public void disconnect() {

    public void disconnect() {

        // It's ok to call this any state, because allowing this lets apps not have

        // 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

        // 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;

        mState = CONNECT_STATE_DISCONNECTING;

        mHandler.post(new Runnable() {

        mHandler.post(new Runnable() {

            @Override

            @Override

services/core/java/com/android/server/media/MediaSessionStack.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -103,7 +103,7 @@ class MediaSessionStack { 
        if (mMediaButtonSession == record) {

        if (mMediaButtonSession == record) {

            // When the media button session is removed, nullify the media button session and do not

            // 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

            // 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.

            // TODO(b/154456172): Make this decision unaltered by non-media app's playback.

            updateMediaButtonSession(null);

            updateMediaButtonSession(null);

        }

        }