Merge "Add 2 APIs (suspend/resume) in MediaPlayer" (230e4c84) · Commits · e / os / android_frameworks_base

media/java/android/media/MediaPlayer.java

+17 −0

Original line number	Diff line number	Diff line
		@@ -2742,6 +2742,23 @@ public class MediaPlayer implements SubtitleController.Listener
		mode == VIDEO_SCALING_MODE_SCALE_TO_FIT_WITH_CROPPING);
		}

		/** @hide
		*/
		public boolean suspend() {
		stayAwake(false);
		return _suspend();
		}

		private native boolean _suspend();

		/** @hide
		*/
		public boolean resume() {
		return _resume();
		}

		private native boolean _resume();

		private Context mProxyContext = null;
		private ProxyReceiver mProxyReceiver = null;

+34 −0

Original line number	Diff line number	Diff line
		@@ -810,6 +810,38 @@ android_media_MediaPlayer_setNextMediaPlayer(JNIEnv *env, jobject thiz, jobject
		;
		}

		static jboolean
		android_media_MediaPlayer_suspend(JNIEnv *env, jobject thiz)
		{
		sp<MediaPlayer> mp = getMediaPlayer(env, thiz);
		if (mp == NULL) {
		jniThrowException(env, "java/lang/IllegalStateException", NULL);
		return false;
		}

		if (mp->suspend() != OK) {
		return false;
		}

		return true;
		}

		static jboolean
		android_media_MediaPlayer_resume(JNIEnv *env, jobject thiz)
		{
		sp<MediaPlayer> mp = getMediaPlayer(env, thiz);
		if (mp == NULL) {
		jniThrowException(env, "java/lang/IllegalStateException", NULL);
		return false;
		}

		if (mp->resume() != OK) {
		return false;
		}

		return true;
		}

		static void
		android_media_MediaPlayer_updateProxyConfig(
		JNIEnv *env, jobject thiz, jobject proxyProps)
		@@ -895,6 +927,8 @@ static JNINativeMethod gMethods[] = {
		{"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},
		{"_suspend", "()Z", (void *)android_media_MediaPlayer_suspend},
		{"_resume", "()Z", (void *)android_media_MediaPlayer_resume},
		};

		static const char* const kClassPathName = "android/media/MediaPlayer";