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

Commit 0395ec61 authored by Hyundo Moon's avatar Hyundo Moon Committed by Android (Google) Code Review
Browse files

Merge "Replace hidden KeyEvent.isMediaKey() usages"

parents d4a3256a c7c1542e

packages/MediaComponents/apex/java/android/media/MediaUtils.java

0 → 100644
+28 −0
Original line number Original line Diff line number Diff line 
package android.media;



import android.view.KeyEvent;



/**

 * @hide

 */

public class MediaUtils {



    // Keep sync with KeyEvent#isMediaKey().

    public static boolean isMediaKey(int keyCode) {

        switch (keyCode) {

            case KeyEvent.KEYCODE_MEDIA_PLAY:

            case KeyEvent.KEYCODE_MEDIA_PAUSE:

            case KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE:

            case KeyEvent.KEYCODE_MUTE:

            case KeyEvent.KEYCODE_HEADSETHOOK:

            case KeyEvent.KEYCODE_MEDIA_STOP:

            case KeyEvent.KEYCODE_MEDIA_NEXT:

            case KeyEvent.KEYCODE_MEDIA_PREVIOUS:

            case KeyEvent.KEYCODE_MEDIA_REWIND:

            case KeyEvent.KEYCODE_MEDIA_RECORD:

            case KeyEvent.KEYCODE_MEDIA_FAST_FORWARD:

                return true;

        }

        return false;

    }

}

packages/MediaComponents/apex/java/android/media/session/MediaController.java

+2 −4
Original line number Original line Diff line number Diff line
@@ -25,6 +25,7 @@ import android.content.Context; 
import android.media.AudioAttributes;

import android.media.AudioAttributes;

import android.media.AudioManager;

import android.media.AudioManager;

import android.media.MediaMetadata;

import android.media.MediaMetadata;

import android.media.MediaUtils;

import android.media.Rating;

import android.media.Rating;

import android.media.VolumeProvider;

import android.media.VolumeProvider;

import android.net.Uri;

import android.net.Uri;
@@ -149,12 +150,9 @@ public final class MediaController { 
        if (keyEvent == null) {

        if (keyEvent == null) {

            throw new IllegalArgumentException("KeyEvent may not be null");

            throw new IllegalArgumentException("KeyEvent may not be null");

        }

        }

        //TODO(b/119789707): Resolve hidden API usage: KeyEvent#isMediaKey

        if (!MediaUtils.isMediaKey(keyEvent.getKeyCode())) {

        /*

        if (!KeyEvent.isMediaKey(keyEvent.getKeyCode())) {

            return false;

            return false;

        }

        }

        */

        try {

        try {

            //TODO(b/119748678): Resolve mContext.getOpPackageName() through this file.

            //TODO(b/119748678): Resolve mContext.getOpPackageName() through this file.

            // Temporarilly it's replaced with "mContext.getOpPackageName()" for compiling.

            // Temporarilly it's replaced with "mContext.getOpPackageName()" for compiling.