From ec25ef020a3ef73eec79667d6fce33563784b0db Mon Sep 17 00:00:00 2001
From: Jin Seok Park <jinpark@google.com>
Date: Thu, 18 Jun 2020 12:34:29 +0900
Subject: [PATCH] [Media ML] Sync with original implementation

Originally, a volume key long press listener would have been called
for the first ACTION_DOWN KeyEvent with repeat count equal to 0, but
the new implementation does not call it.
This CL fixes the current implementation to match the original
implementation.

Bug: 157988289
Test: manually
Change-Id: I563215fc522e952412ebbae1ddaa1a6b1b646c53
---
 .../java/com/android/server/media/MediaSessionService.java     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/services/core/java/com/android/server/media/MediaSessionService.java b/services/core/java/com/android/server/media/MediaSessionService.java
index c42ea8aa202d9..a162eb87ca714 100644
--- a/services/core/java/com/android/server/media/MediaSessionService.java
+++ b/services/core/java/com/android/server/media/MediaSessionService.java
@@ -2572,6 +2572,9 @@ public class MediaSessionService extends SystemService implements Monitor {
                     }
                 } else {
                     if (mKeyType == KEY_TYPE_VOLUME) {
+                        if (isFirstLongPressKeyEvent(keyEvent)) {
+                            dispatchVolumeKeyLongPressLocked(mTrackingFirstDownKeyEvent);
+                        }
                         dispatchVolumeKeyLongPressLocked(keyEvent);
                     } else if (isFirstLongPressKeyEvent(keyEvent)
                             && isVoiceKey(keyEvent.getKeyCode())) {