Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c16bdea3 authored by Jaewan Kim's avatar Jaewan Kim
Browse files

MediaSessionService: Leave log for all incoming media/volume keys 

Bug: 141967578
Test: Build and run
Change-Id: I892178cf0a043726134ef0e7a91aa110cd381d6d
parent bffb1964

services/core/java/com/android/server/media/MediaSessionService.java

+11 −12
Original line number Diff line number Diff line
@@ -1316,7 +1316,6 @@ public class MediaSessionService extends SystemService implements Monitor { 
         * pressed.

         *

         * @param packageName The caller's package name, obtained by Context#getPackageName()

         * @param opPackageName The caller's op package name, obtained by Context#getOpPackageName()

         * @param sessionToken token for the session that the controller is pointing to

         * @param keyEvent media key event

         * @see #dispatchVolumeKeyEvent
@@ -1330,15 +1329,15 @@ public class MediaSessionService extends SystemService implements Monitor { 
            try {

                synchronized (mLock) {

                    MediaSessionRecord record = getMediaSessionRecordLocked(sessionToken);

                    if (record == null) {

                        Log.w(TAG, "Failed to find session to dispatch key event.");

                        return false;

                    }

                    if (DEBUG) {

                    if (DEBUG_KEY_EVENT) {

                        Log.d(TAG, "dispatchMediaKeyEventToSessionAsSystemService, pkg="

                                + packageName + ", pid=" + pid + ", uid=" + uid + ", sessionToken="

                                + sessionToken + ", event=" + keyEvent + ", session=" + record);

                    }

                    if (record == null) {

                        Log.w(TAG, "Failed to find session to dispatch key event.");

                        return false;

                    }

                    return record.sendMediaButton(packageName, pid, uid, true /* asSystemService */,

                            keyEvent, 0, null);

                }
@@ -1688,6 +1687,12 @@ public class MediaSessionService extends SystemService implements Monitor { 
            try {

                synchronized (mLock) {

                    MediaSessionRecord record = getMediaSessionRecordLocked(sessionToken);

                    if (DEBUG_KEY_EVENT) {

                        Log.d(TAG, "dispatchVolumeKeyEventToSessionAsSystemService, pkg="

                                + packageName + ", opPkg=" + opPackageName + ", pid=" + pid

                                + ", uid=" + uid + ", sessionToken=" + sessionToken + ", event="

                                + keyEvent + ", session=" + record);

                    }

                    if (record == null) {

                        Log.w(TAG, "Failed to find session to dispatch key event, token="

                                + sessionToken + ". Fallbacks to the default handling.");
@@ -1695,12 +1700,6 @@ public class MediaSessionService extends SystemService implements Monitor { 
                                keyEvent, AudioManager.USE_DEFAULT_STREAM_TYPE, false);

                        return;

                    }

                    if (DEBUG) {

                        Log.d(TAG, "dispatchVolumeKeyEventToSessionAsSystemService, pkg="

                                + packageName + ", opPkg=" + opPackageName + ", pid=" + pid

                                + ", uid=" + uid + ", sessionToken=" + sessionToken + ", event="

                                + keyEvent + ", session=" + record);

                    }

                    switch (keyEvent.getAction()) {

                        case KeyEvent.ACTION_DOWN: {

                            int direction = 0;