From 88c09af9ad786cdb342cdfd717ea0d1ca5b10bfd Mon Sep 17 00:00:00 2001
From: Sungsoo Lim <sungsoo@google.com>
Date: Sat, 24 Jul 2021 11:04:01 +0900
Subject: [PATCH] Do not pass the volume key event to remote sessions

Bug: 194245558
Test: manually
Change-Id: Ic620d0efffdd18242c99eae40fa289bbdfd1b31a
---
 .../core/java/com/android/server/media/MediaSessionStack.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/media/MediaSessionStack.java b/services/core/java/com/android/server/media/MediaSessionStack.java
index 50eed19389dc1..c4c21df746b38 100644
--- 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;
             }