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

Commit aa1edf93 authored by Gyumin Sim's avatar Gyumin Sim Committed by Automerger Merge Worker
Browse files

Merge "Comply with inclusive language guidance in media session and browser"... 

Merge "Comply with inclusive language guidance in media session and browser" am: 93a807bc am: 75fa27a1

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1425508

Change-Id: I2b9b4eef4cf075e9b38de2f5db4e73db3406e16a
parents 70d4f9ab 75fa27a1

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

        }

        }