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

Commit 6fe8055c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "[Media ML] Support customization for volume keys" into rvc-dev am:... 

Merge "[Media ML] Support customization for volume keys" into rvc-dev am: cd03d90a am: ad8ebec2 am: a4e7238f

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11862405

Change-Id: I5906505229368c87c09bb05c1273483aeaa6ac94
parents 6c5cc771 a4e7238f

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

+9 −0
Original line number Diff line number Diff line
@@ -71,6 +71,9 @@ public abstract class MediaKeyDispatcher { 
        mOverriddenKeyEvents.put(KeyEvent.KEYCODE_MEDIA_STOP, 0);

        mOverriddenKeyEvents.put(KeyEvent.KEYCODE_MEDIA_NEXT, 0);

        mOverriddenKeyEvents.put(KeyEvent.KEYCODE_MEDIA_PREVIOUS, 0);

        mOverriddenKeyEvents.put(KeyEvent.KEYCODE_VOLUME_DOWN, 0);

        mOverriddenKeyEvents.put(KeyEvent.KEYCODE_VOLUME_UP, 0);

        mOverriddenKeyEvents.put(KeyEvent.KEYCODE_VOLUME_MUTE, 0);

    }



    // TODO: Move this method into SessionPolicyProvider.java for better readability.
@@ -126,6 +129,9 @@ public abstract class MediaKeyDispatcher { 
     * <li> {@link KeyEvent#KEYCODE_MEDIA_STOP}

     * <li> {@link KeyEvent#KEYCODE_MEDIA_NEXT}

     * <li> {@link KeyEvent#KEYCODE_MEDIA_PREVIOUS}

     * <li> {@link KeyEvent#KEYCODE_VOLUME_UP}

     * <li> {@link KeyEvent#KEYCODE_VOLUME_DOWN}

     * <li> {@link KeyEvent#KEYCODE_VOLUME_MUTE}

     * </ul>

     * @see {@link KeyEvent#isMediaSessionKey(int)}

     */
@@ -164,6 +170,9 @@ public abstract class MediaKeyDispatcher { 
     * <li> {@link KeyEvent#KEYCODE_MEDIA_STOP}

     * <li> {@link KeyEvent#KEYCODE_MEDIA_NEXT}

     * <li> {@link KeyEvent#KEYCODE_MEDIA_PREVIOUS}

     * <li> {@link KeyEvent#KEYCODE_VOLUME_DOWN}

     * <li> {@link KeyEvent#KEYCODE_VOLUME_UP}

     * <li> {@link KeyEvent#KEYCODE_VOLUME_MUTE}

     * </ul>

     * @see {@link KeyEvent#isMediaSessionKey(int)}

     * @param keyCode

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

+338 −326

File changed.

Preview size limit exceeded, changes collapsed.