Merge "At STARTED_AS_NEXT, offload MediaPlayer.start() to a separate thread" into oc-mr1-dev (52700a97) · Commits · e / os / android_frameworks_base

media/java/android/media/MediaPlayer.java

+9 −3

Original line number	Diff line number	Diff line
		@@ -3408,7 +3408,7 @@ public class MediaPlayer extends PlayerBase
		private static void postEventFromNative(Object mediaplayer_ref,
		int what, int arg1, int arg2, Object obj)
		{
		MediaPlayer mp = (MediaPlayer)((WeakReference)mediaplayer_ref).get();
		final MediaPlayer mp = (MediaPlayer)((WeakReference)mediaplayer_ref).get();
		if (mp == null) {
		return;
		}
		@@ -3416,9 +3416,15 @@ public class MediaPlayer extends PlayerBase
		switch (what) {
		case MEDIA_INFO:
		if (arg1 == MEDIA_INFO_STARTED_AS_NEXT) {
		new Thread(new Runnable() {
		@Override
		public void run() {
		// this acquires the wakelock if needed, and sets the client side state
		mp.start();
		}
		}).start();
		Thread.yield();
		}
		break;

		case MEDIA_DRM_INFO: