Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Comply with inclusive language guidance in media session and browser" am: 93a807bcf7

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

Change-Id: I8d15b8a73d0d49eadd9d0c295430dcd6d34acbd2
This commit is contained in:
Gyumin Sim
2020-09-11 04:22:52 +00:00
committed by Automerger Merge Worker
parent 3979981b2d 93a807bcf7
commit 75fa27a100
3 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
apex/media/framework/java/android/media/MediaController2.java
View File

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

2
media/java/android/media/browse/MediaBrowser.java
View File

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

2
services/core/java/com/android/server/media/MediaSessionStack.java
View File

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