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

Merge "Exclude MediaSession2 from the media button session" into rvc-dev am: 31fdc74154

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

Change-Id: Ia533e6b9f0f1ad379d3e4febe542bb627b5fd875
This commit is contained in:
TreeHugger Robot
2020-07-02 06:30:33 +00:00
committed by Automerger Merge Worker
parent 1d658df5e3 31fdc74154
commit 458d37d5bb
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2099,7 +2099,7 @@ public class MediaSessionService extends SystemService implements Monitor {
boolean asSystemService, KeyEvent keyEvent, boolean needWakeLock) { boolean asSystemService, KeyEvent keyEvent, boolean needWakeLock) {
if (mCurrentFullUserRecord.getMediaButtonSessionLocked() if (mCurrentFullUserRecord.getMediaButtonSessionLocked()
instanceof MediaSession2Record) { instanceof MediaSession2Record) {
// TODO(jaewan): Implement // TODO(jaewan): Make MediaSession2 to receive media key event
return; return;
} }
MediaSessionRecord session = null; MediaSessionRecord session = null;

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

@@ -244,6 +244,10 @@ class MediaSessionStack {
private MediaSessionRecordImpl findMediaButtonSession(int uid) { private MediaSessionRecordImpl findMediaButtonSession(int uid) {
MediaSessionRecordImpl mediaButtonSession = null; MediaSessionRecordImpl mediaButtonSession = null;
for (MediaSessionRecordImpl session : mSessions) { for (MediaSessionRecordImpl session : mSessions) {
if (session instanceof MediaSession2Record) {
// TODO(jaewan): Make MediaSession2 to receive media key event
continue;
}
if (uid == session.getUid()) { if (uid == session.getUid()) {
if (session.checkPlaybackActiveState( if (session.checkPlaybackActiveState(
mAudioPlayerStateMonitor.isPlaybackActive(session.getUid()))) { mAudioPlayerStateMonitor.isPlaybackActive(session.getUid()))) {