Remove unused MediaPlayer methods
Change-Id: Id63fdde7d0e4f096d3bb9eb4da5e0f37eb9dea21
diff --git a/media/java/android/media/MediaPlayer.java b/media/java/android/media/MediaPlayer.java
index b729640..e5f0cd9 100644
--- a/media/java/android/media/MediaPlayer.java
+++ b/media/java/android/media/MediaPlayer.java
@@ -619,9 +619,8 @@
*
* @return A parcel suitable to hold a request for the native
* player.
- * {@hide}
*/
- public Parcel newRequest() {
+ private Parcel newRequest() {
Parcel parcel = Parcel.obtain();
parcel.writeInterfaceToken(IMEDIA_PLAYER);
return parcel;
@@ -639,10 +638,8 @@
*
* @param reply Output parcel with the data returned by the
* native player.
- *
- * {@hide}
*/
- public void invoke(Parcel request, Parcel reply) {
+ private void invoke(Parcel request, Parcel reply) {
int retcode = native_invoke(request, reply);
reply.setDataPosition(0);
if (retcode != 0) {
@@ -1410,13 +1407,6 @@
}
/**
- * Currently not implemented, returns null.
- * @deprecated
- * @hide
- */
- public native Bitmap getFrameAt(int msec) throws IllegalStateException;
-
- /**
* Sets the audio session ID.
*
* @param sessionId the audio session ID.
@@ -1458,100 +1448,6 @@
*/
public native void attachAuxEffect(int effectId);
- /* Do not change these values (starting with KEY_PARAMETER) without updating
- * their counterparts in include/media/mediaplayer.h!
- */
-
- // There are currently no defined keys usable from Java with get*Parameter.
- // But if any keys are defined, the order must be kept in sync with include/media/mediaplayer.h.
- // private static final int KEY_PARAMETER_... = ...;
-
- /**
- * Sets the parameter indicated by key.
- * @param key key indicates the parameter to be set.
- * @param value value of the parameter to be set.
- * @return true if the parameter is set successfully, false otherwise
- * {@hide}
- */
- public native boolean setParameter(int key, Parcel value);
-
- /**
- * Sets the parameter indicated by key.
- * @param key key indicates the parameter to be set.
- * @param value value of the parameter to be set.
- * @return true if the parameter is set successfully, false otherwise
- * {@hide}
- */
- public boolean setParameter(int key, String value) {
- Parcel p = Parcel.obtain();
- p.writeString(value);
- boolean ret = setParameter(key, p);
- p.recycle();
- return ret;
- }
-
- /**
- * Sets the parameter indicated by key.
- * @param key key indicates the parameter to be set.
- * @param value value of the parameter to be set.
- * @return true if the parameter is set successfully, false otherwise
- * {@hide}
- */
- public boolean setParameter(int key, int value) {
- Parcel p = Parcel.obtain();
- p.writeInt(value);
- boolean ret = setParameter(key, p);
- p.recycle();
- return ret;
- }
-
- /*
- * Gets the value of the parameter indicated by key.
- * @param key key indicates the parameter to get.
- * @param reply value of the parameter to get.
- */
- private native void getParameter(int key, Parcel reply);
-
- /**
- * Gets the value of the parameter indicated by key.
- * The caller is responsible for recycling the returned parcel.
- * @param key key indicates the parameter to get.
- * @return value of the parameter.
- * {@hide}
- */
- public Parcel getParcelParameter(int key) {
- Parcel p = Parcel.obtain();
- getParameter(key, p);
- return p;
- }
-
- /**
- * Gets the value of the parameter indicated by key.
- * @param key key indicates the parameter to get.
- * @return value of the parameter.
- * {@hide}
- */
- public String getStringParameter(int key) {
- Parcel p = Parcel.obtain();
- getParameter(key, p);
- String ret = p.readString();
- p.recycle();
- return ret;
- }
-
- /**
- * Gets the value of the parameter indicated by key.
- * @param key key indicates the parameter to get.
- * @return value of the parameter.
- * {@hide}
- */
- public int getIntParameter(int key) {
- Parcel p = Parcel.obtain();
- getParameter(key, p);
- int ret = p.readInt();
- p.recycle();
- return ret;
- }
/**
* Sets the send level of the player to the attached auxiliary effect
diff --git a/media/jni/android_media_MediaPlayer.cpp b/media/jni/android_media_MediaPlayer.cpp
index 7c607ea..0f78649 100644
--- a/media/jni/android_media_MediaPlayer.cpp
+++ b/media/jni/android_media_MediaPlayer.cpp
@@ -525,14 +525,6 @@
process_media_player_call( env, thiz, mp->setVolume(leftVolume, rightVolume), NULL, NULL );
}
-// FIXME: deprecated
-static jobject
-android_media_MediaPlayer_getFrameAt(JNIEnv *env, jobject thiz, jint msec)
-{
- return NULL;
-}
-
-
// Sends the request and reply parcels to the media player via the
// binder interface.
static jint
@@ -781,39 +773,6 @@
return ret;
}
-static jboolean
-android_media_MediaPlayer_setParameter(JNIEnv *env, jobject thiz, jint key, jobject java_request)
-{
- ALOGV("setParameter: key %d", key);
- sp<MediaPlayer> mp = getMediaPlayer(env, thiz);
- if (mp == NULL ) {
- jniThrowException(env, "java/lang/IllegalStateException", NULL);
- return false;
- }
-
- Parcel *request = parcelForJavaObject(env, java_request);
- status_t err = mp->setParameter(key, *request);
- if (err == OK) {
- return true;
- } else {
- return false;
- }
-}
-
-static void
-android_media_MediaPlayer_getParameter(JNIEnv *env, jobject thiz, jint key, jobject java_reply)
-{
- ALOGV("getParameter: key %d", key);
- sp<MediaPlayer> mp = getMediaPlayer(env, thiz);
- if (mp == NULL ) {
- jniThrowException(env, "java/lang/IllegalStateException", NULL);
- return;
- }
-
- Parcel *reply = parcelForJavaObject(env, java_reply);
- process_media_player_call(env, thiz, mp->getParameter(key, reply), NULL, NULL );
-}
-
static void
android_media_MediaPlayer_setNextMediaPlayer(JNIEnv *env, jobject thiz, jobject java_player)
{
@@ -912,7 +871,6 @@
{"setLooping", "(Z)V", (void *)android_media_MediaPlayer_setLooping},
{"isLooping", "()Z", (void *)android_media_MediaPlayer_isLooping},
{"setVolume", "(FF)V", (void *)android_media_MediaPlayer_setVolume},
- {"getFrameAt", "(I)Landroid/graphics/Bitmap;", (void *)android_media_MediaPlayer_getFrameAt},
{"native_invoke", "(Landroid/os/Parcel;Landroid/os/Parcel;)I",(void *)android_media_MediaPlayer_invoke},
{"native_setMetadataFilter", "(Landroid/os/Parcel;)I", (void *)android_media_MediaPlayer_setMetadataFilter},
{"native_getMetadata", "(ZZLandroid/os/Parcel;)Z", (void *)android_media_MediaPlayer_getMetadata},
@@ -924,8 +882,6 @@
{"setAuxEffectSendLevel", "(F)V", (void *)android_media_MediaPlayer_setAuxEffectSendLevel},
{"attachAuxEffect", "(I)V", (void *)android_media_MediaPlayer_attachAuxEffect},
{"native_pullBatteryData", "(Landroid/os/Parcel;)I", (void *)android_media_MediaPlayer_pullBatteryData},
- {"setParameter", "(ILandroid/os/Parcel;)Z", (void *)android_media_MediaPlayer_setParameter},
- {"getParameter", "(ILandroid/os/Parcel;)V", (void *)android_media_MediaPlayer_getParameter},
{"native_setRetransmitEndpoint", "(Ljava/lang/String;I)I", (void *)android_media_MediaPlayer_setRetransmitEndpoint},
{"setNextMediaPlayer", "(Landroid/media/MediaPlayer;)V", (void *)android_media_MediaPlayer_setNextMediaPlayer},
{"updateProxyConfig", "(Landroid/net/ProxyProperties;)V", (void *)android_media_MediaPlayer_updateProxyConfig},