Merge "Revert "Replace hidden KeyEvent.isMediaKey() usages"" (45214bb8) · Commits · e / os / android_frameworks_av

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

deleted100644 → 0

+0 −28

Original line number	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;
		}
		}

+4 −2

Original line number	Diff line number	Diff line
		@@ -25,7 +25,6 @@ import android.content.Context;
		import android.media.AudioAttributes;
		import android.media.AudioManager;
		import android.media.MediaMetadata;
		import android.media.MediaUtils;
		import android.media.Rating;
		import android.media.VolumeProvider;
		import android.net.Uri;
		@@ -150,9 +149,12 @@ public final class MediaController {
		if (keyEvent == null) {
		throw new IllegalArgumentException("KeyEvent may not be null");
		}
		if (!MediaUtils.isMediaKey(keyEvent.getKeyCode())) {
		//TODO(b/119789707): Resolve hidden API usage: KeyEvent#isMediaKey
		/*
		if (!KeyEvent.isMediaKey(keyEvent.getKeyCode())) {
		return false;
		}
		*/
		try {
		//TODO(b/119748678): Resolve mContext.getOpPackageName() through this file.
		// Temporarilly it's replaced with "mContext.getOpPackageName()" for compiling.