diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-02 06:30:21 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-02 06:30:21 +0000 |
| commit | a5b0451eb68b176732b30bcd9722cad67eb1520f (patch) | |
| tree | 7a58e3f3e71d91960b15d10fdb7d1c91c28dde5c | |
| parent | 2aa907fbab9b335e7a9b77e191490ea53cbb0952 (diff) | |
| parent | 31fdc7415460ca1aace74da11d2375b165018529 (diff) | |
Merge "Exclude MediaSession2 from the media button session" into rvc-dev am: 31fdc74154
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12042284
Change-Id: I8e8f8c6518c45130203df5aee8212041074f5c0b
| -rw-r--r-- | services/core/java/com/android/server/media/MediaSessionService.java | 2 | ||||
| -rw-r--r-- | services/core/java/com/android/server/media/MediaSessionStack.java | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/media/MediaSessionService.java b/services/core/java/com/android/server/media/MediaSessionService.java index b45d450cd200..9b356f0e8eef 100644 --- a/services/core/java/com/android/server/media/MediaSessionService.java +++ b/services/core/java/com/android/server/media/MediaSessionService.java @@ -2099,7 +2099,7 @@ public class MediaSessionService extends SystemService implements Monitor { boolean asSystemService, KeyEvent keyEvent, boolean needWakeLock) { if (mCurrentFullUserRecord.getMediaButtonSessionLocked() instanceof MediaSession2Record) { - // TODO(jaewan): Implement + // TODO(jaewan): Make MediaSession2 to receive media key event return; } MediaSessionRecord session = null; diff --git a/services/core/java/com/android/server/media/MediaSessionStack.java b/services/core/java/com/android/server/media/MediaSessionStack.java index 402355a0161a..b678c8962a21 100644 --- a/services/core/java/com/android/server/media/MediaSessionStack.java +++ b/services/core/java/com/android/server/media/MediaSessionStack.java @@ -244,6 +244,10 @@ class MediaSessionStack { private MediaSessionRecordImpl findMediaButtonSession(int uid) { MediaSessionRecordImpl mediaButtonSession = null; for (MediaSessionRecordImpl session : mSessions) { + if (session instanceof MediaSession2Record) { + // TODO(jaewan): Make MediaSession2 to receive media key event + continue; + } if (uid == session.getUid()) { if (session.checkPlaybackActiveState( mAudioPlayerStateMonitor.isPlaybackActive(session.getUid()))) { |