Merge "Remove incomplete media router API." into mnc-dev (1290748d) · Commits · e / os / android_frameworks_base

Android.mk

deleted100644 → 0

+0 −1098

File deleted.

Preview size limit exceeded, changes collapsed.

tests/OneMedia/Android.mk

+0 −3

Original line number	Diff line number	Diff line
		@@ -9,9 +9,6 @@ LOCAL_SRC_FILES := $(call all-subdir-java-files) \
		LOCAL_PACKAGE_NAME := OneMedia
		LOCAL_CERTIFICATE := platform

		LOCAL_STATIC_JAVA_LIBRARIES := \
		android-support-media-protocols

		LOCAL_JAVA_LIBRARIES += org.apache.http.legacy

		LOCAL_PROGUARD_ENABLED := disabled

tests/OneMedia/AndroidManifest.xml

+0 −9

Original line number	Diff line number	Diff line
		@@ -27,15 +27,6 @@
		android:name="com.android.onemedia.OnePlayerService"
		android:exported="true"
		android:process="com.android.onemedia.service" />
		<service
		android:name=".provider.OneMediaRouteProvider"
		android:permission="android.permission.BIND_MEDIA_ROUTE_SERVICE"
		android:exported="true"
		android:process="com.android.onemedia.provider">
		<intent-filter>
		<action android:name="android.media.routing.MediaRouteService" />
		</intent-filter>
		</service>
		</application>

		</manifest>

tests/OneMedia/src/com/android/onemedia/PlayerSession.java

+0 −83

Original line number	Diff line number	Diff line
		@@ -19,25 +19,17 @@ import android.content.Context;
		import android.content.Intent;
		import android.graphics.Bitmap;
		import android.media.MediaMetadata;
		import android.media.routing.MediaRouteSelector;
		import android.media.routing.MediaRouter;
		import android.media.routing.MediaRouter.ConnectionRequest;
		import android.media.routing.MediaRouter.DestinationInfo;
		import android.media.routing.MediaRouter.RouteInfo;
		import android.media.session.MediaSession;
		import android.media.session.MediaSession.QueueItem;
		import android.media.session.MediaSessionManager;
		import android.media.session.PlaybackState;
		import android.os.Bundle;
		import android.support.media.protocols.MediaPlayerProtocol;
		import android.support.media.protocols.MediaPlayerProtocol.MediaStatus;
		import android.os.RemoteException;
		import android.os.SystemClock;
		import android.util.Log;
		import android.view.KeyEvent;

		import com.android.onemedia.playback.LocalRenderer;
		import com.android.onemedia.playback.OneMRPRenderer;
		import com.android.onemedia.playback.Renderer;
		import com.android.onemedia.playback.RequestUtils;

		@@ -48,7 +40,6 @@ public class PlayerSession {
		private static final String TAG = "PlayerSession";

		protected MediaSession mSession;
		protected MediaRouter mRouter;
		protected Context mContext;
		protected Renderer mRenderer;
		protected MediaSession.Callback mCallback;
		@@ -84,22 +75,11 @@ public class PlayerSession {
		.getSystemService(Context.MEDIA_SESSION_SERVICE);
		Log.d(TAG, "Creating session for package " + mContext.getBasePackageName());

		mRouter = new MediaRouter(mContext);
		mRouter.addSelector(new MediaRouteSelector.Builder()
		.addRequiredProtocol(MediaPlayerProtocol.class)
		.build());
		mRouter.addSelector(new MediaRouteSelector.Builder()
		.setRequiredFeatures(MediaRouter.ROUTE_FEATURE_LIVE_AUDIO)
		.setOptionalFeatures(MediaRouter.ROUTE_FEATURE_LIVE_VIDEO)
		.build());
		mRouter.setRoutingCallback(new RoutingCallback(), null);

		mSession = new MediaSession(mContext, "OneMedia");
		mSession.setCallback(mCallback);
		mSession.setPlaybackState(mPlaybackState);
		mSession.setFlags(MediaSession.FLAG_HANDLES_TRANSPORT_CONTROLS
		\| MediaSession.FLAG_HANDLES_MEDIA_BUTTONS);
		mSession.setMediaRouter(mRouter);
		mSession.setActive(true);
		updateMetadata();
		}
		@@ -117,10 +97,6 @@ public class PlayerSession {
		mSession.release();
		mSession = null;
		}
		if (mRouter != null) {
		mRouter.release();
		mRouter = null;
		}
		}

		public void setListener(Listener listener) {
		@@ -278,63 +254,4 @@ public class PlayerSession {
		mRenderer.onPause();
		}
		}

		private class RoutingCallback extends MediaRouter.RoutingCallback {
		@Override
		public void onConnectionStateChanged(int state) {
		if (state == MediaRouter.CONNECTION_STATE_CONNECTING) {
		if (mRenderer != null) {
		mRenderer.onStop();
		}
		mRenderer = null;
		updateState(PlaybackState.STATE_CONNECTING);
		return;
		}

		MediaRouter.ConnectionInfo connection = mRouter.getConnection();
		if (connection != null) {
		MediaPlayerProtocol protocol =
		connection.getProtocolObject(MediaPlayerProtocol.class);
		if (protocol != null) {
		Log.d(TAG, "Connected to route using media player protocol");

		protocol.setCallback(new PlayerCallback(), null);
		mRenderer = new OneMRPRenderer(protocol);
		updateState(PlaybackState.STATE_NONE);
		return;
		}
		}

		// Use local route
		mRenderer = new LocalRenderer(mContext, null);
		mRenderer.registerListener(mRenderListener);
		updateState(PlaybackState.STATE_NONE);
		}
		}

		private class PlayerCallback extends MediaPlayerProtocol.Callback {
		@Override
		public void onStatusUpdated(MediaStatus status, Bundle extras) {
		if (status != null) {
		Log.d(TAG, "Received status update: " + status.toBundle());
		switch (status.getPlayerState()) {
		case MediaStatus.PLAYER_STATE_BUFFERING:
		updateState(PlaybackState.STATE_BUFFERING);
		break;
		case MediaStatus.PLAYER_STATE_IDLE:
		updateState(PlaybackState.STATE_STOPPED);
		break;
		case MediaStatus.PLAYER_STATE_PAUSED:
		updateState(PlaybackState.STATE_PAUSED);
		break;
		case MediaStatus.PLAYER_STATE_PLAYING:
		updateState(PlaybackState.STATE_PLAYING);
		break;
		case MediaStatus.PLAYER_STATE_UNKNOWN:
		updateState(PlaybackState.STATE_NONE);
		break;
		}
		}
		}
		}
		}

tests/OneMedia/src/com/android/onemedia/playback/OneMRPRenderer.java

deleted100644 → 0

+0 −47

Original line number	Diff line number	Diff line
		package com.android.onemedia.playback;

		import android.os.Bundle;
		import android.support.media.protocols.MediaPlayerProtocol;
		import android.support.media.protocols.MediaPlayerProtocol.MediaInfo;

		/**
		* Renderer for communicating with the OneMRP route
		*/
		public class OneMRPRenderer extends Renderer {
		private final MediaPlayerProtocol mProtocol;

		public OneMRPRenderer(MediaPlayerProtocol protocol) {
		super(null, null);
		mProtocol = protocol;
		}

		@Override
		public void setContent(Bundle request) {
		MediaInfo mediaInfo = new MediaInfo(request.getString(RequestUtils.EXTRA_KEY_SOURCE),
		MediaInfo.STREAM_TYPE_BUFFERED, "audio/mp3");
		mProtocol.load(mediaInfo, true, 0, null);
		}

		@Override
		public boolean onStop() {
		mProtocol.stop(null);
		return true;
		}

		@Override
		public boolean onPlay() {
		mProtocol.play(null);
		return true;
		}

		@Override
		public boolean onPause() {
		mProtocol.pause(null);
		return true;
		}

		@Override
		public long getSeekPosition() {
		return -1;
		}
		}