Merge "Do not pass the volume key event to remote sessions" into sc-dev

2021-07-27 23:09:56 +00:00
parent dfa9b3058f 88c09af9ad
commit f408df6338
1 changed files with 2 additions and 1 deletions
--- a/services/core/java/com/android/server/media/MediaSessionStack.java
+++ b/services/core/java/com/android/server/media/MediaSessionStack.java
@@ -325,7 +325,8 @@ class MediaSessionStack {
        int size = records.size();
        for (int i = 0; i < size; i++) {
            MediaSessionRecord record = records.get(i);
-            if (record.checkPlaybackActiveState(true)) {
+            // Do not send the volume key events to remote sessions.
+            if (record.checkPlaybackActiveState(true) && record.isPlaybackTypeLocal()) {
                mCachedVolumeDefault = record;
                return record;
            }