Merge "MediaSession2: Reject calls from a Controller that haven't allowed" (cb3b84b5) · Commits · e / os / android_frameworks_av

packages/MediaComponents/src/com/android/media/MediaController2Impl.java

+53 −16

Original line number	Diff line number	Diff line
		@@ -16,6 +16,8 @@

		package com.android.media;

		import static android.media.MediaSession2.*;

		import android.app.PendingIntent;
		import android.content.ComponentName;
		import android.content.Context;
		@@ -79,7 +81,7 @@ public class MediaController2Impl implements MediaController2Provider {
		@GuardedBy("mLock")
		private PendingIntent mSessionActivity;
		@GuardedBy("mLock")
		private CommandGroup mCommandGroup;
		private CommandGroup mAllowedCommands;

		// Assignment should be used with the lock hold, but should be used without a lock to prevent
		// potential deadlock.
		@@ -248,6 +250,42 @@ public class MediaController2Impl implements MediaController2Provider {
		return mInstance;
		}

		// Returns session binder if the controller can send the command.
		IMediaSession2 getSessionBinderIfAble(int commandCode) {
		synchronized (mLock) {
		if (!mAllowedCommands.hasCommand(commandCode)) {
		// Cannot send because isn't allowed to.
		Log.w(TAG, "Controller isn't allowed to call command, commandCode="
		+ commandCode);
		return null;
		}
		}
		// TODO(jaewan): Should we do this with the lock hold?
		final IMediaSession2 binder = mSessionBinder;
		if (binder == null) {
		// Cannot send because disconnected.
		Log.w(TAG, "Session is disconnected");
		}
		return binder;
		}

		// Returns session binder if the controller can send the command.
		IMediaSession2 getSessionBinderIfAble(Command command) {
		synchronized (mLock) {
		if (!mAllowedCommands.hasCommand(command)) {
		Log.w(TAG, "Controller isn't allowed to call command, command=" + command);
		return null;
		}
		}
		// TODO(jaewan): Should we do this with the lock hold?
		final IMediaSession2 binder = mSessionBinder;
		if (binder == null) {
		// Cannot send because disconnected.
		Log.w(TAG, "Session is disconnected");
		}
		return binder;
		}

		@Override
		public SessionToken2 getSessionToken_impl() {
		return mToken;
		@@ -312,7 +350,7 @@ public class MediaController2Impl implements MediaController2Provider {
		@Override
		public void setVolumeTo_impl(int value, int flags) {
		// TODO(hdmoon): sanity check
		final IMediaSession2 binder = mSessionBinder;
		final IMediaSession2 binder = getSessionBinderIfAble(COMMAND_CODE_SET_VOLUME);
		if (binder != null) {
		try {
		binder.setVolumeTo(mSessionCallbackStub, value, flags);
		@@ -327,7 +365,7 @@ public class MediaController2Impl implements MediaController2Provider {
		@Override
		public void adjustVolume_impl(int direction, int flags) {
		// TODO(hdmoon): sanity check
		final IMediaSession2 binder = mSessionBinder;
		final IMediaSession2 binder = getSessionBinderIfAble(COMMAND_CODE_SET_VOLUME);
		if (binder != null) {
		try {
		binder.adjustVolume(mSessionCallbackStub, direction, flags);
		@@ -341,7 +379,7 @@ public class MediaController2Impl implements MediaController2Provider {

		@Override
		public void prepareFromUri_impl(Uri uri, Bundle extras) {
		final IMediaSession2 binder = mSessionBinder;
		final IMediaSession2 binder = getSessionBinderIfAble(COMMAND_CODE_PREPARE_FROM_URI);
		if (binder != null) {
		try {
		binder.prepareFromUri(mSessionCallbackStub, uri, extras);
		@@ -355,7 +393,7 @@ public class MediaController2Impl implements MediaController2Provider {

		@Override
		public void prepareFromSearch_impl(String query, Bundle extras) {
		final IMediaSession2 binder = mSessionBinder;
		final IMediaSession2 binder = getSessionBinderIfAble(COMMAND_CODE_PREPARE_FROM_SEARCH);
		if (binder != null) {
		try {
		binder.prepareFromSearch(mSessionCallbackStub, query, extras);
		@@ -369,7 +407,7 @@ public class MediaController2Impl implements MediaController2Provider {

		@Override
		public void prepareMediaId_impl(String mediaId, Bundle extras) {
		final IMediaSession2 binder = mSessionBinder;
		final IMediaSession2 binder = getSessionBinderIfAble(COMMAND_CODE_PREPARE_FROM_MEDIA_ID);
		if (binder != null) {
		try {
		binder.prepareFromMediaId(mSessionCallbackStub, mediaId, extras);
		@@ -383,7 +421,7 @@ public class MediaController2Impl implements MediaController2Provider {

		@Override
		public void playFromUri_impl(Uri uri, Bundle extras) {
		final IMediaSession2 binder = mSessionBinder;
		final IMediaSession2 binder = getSessionBinderIfAble(COMMAND_CODE_PLAY_FROM_URI);
		if (binder != null) {
		try {
		binder.playFromUri(mSessionCallbackStub, uri, extras);
		@@ -397,7 +435,7 @@ public class MediaController2Impl implements MediaController2Provider {

		@Override
		public void playFromSearch_impl(String query, Bundle extras) {
		final IMediaSession2 binder = mSessionBinder;
		final IMediaSession2 binder = getSessionBinderIfAble(COMMAND_CODE_PLAY_FROM_SEARCH);
		if (binder != null) {
		try {
		binder.playFromSearch(mSessionCallbackStub, query, extras);
		@@ -411,7 +449,7 @@ public class MediaController2Impl implements MediaController2Provider {

		@Override
		public void playFromMediaId_impl(String mediaId, Bundle extras) {
		final IMediaSession2 binder = mSessionBinder;
		final IMediaSession2 binder = getSessionBinderIfAble(COMMAND_CODE_PLAY_FROM_MEDIA_ID);
		if (binder != null) {
		try {
		binder.playFromMediaId(mSessionCallbackStub, mediaId, extras);
		@@ -449,8 +487,7 @@ public class MediaController2Impl implements MediaController2Provider {
		if (command == null) {
		throw new IllegalArgumentException("command shouldn't be null");
		}
		// TODO(jaewan): Also check if the command is allowed.
		final IMediaSession2 binder = mSessionBinder;
		final IMediaSession2 binder = getSessionBinderIfAble(command);
		if (binder != null) {
		try {
		binder.sendCustomCommand(mSessionCallbackStub, command.toBundle(), args, cb);
		@@ -636,16 +673,16 @@ public class MediaController2Impl implements MediaController2Provider {

		// Should be used without a lock to prevent potential deadlock.
		void onConnectedNotLocked(IMediaSession2 sessionBinder,
		final CommandGroup commandGroup, final PlaybackState2 state, final PlaybackInfo info,
		final CommandGroup allowedCommands, final PlaybackState2 state, final PlaybackInfo info,
		final PlaylistParams params, final List<MediaItem2> playlist,
		final PendingIntent sessionActivity) {
		if (DEBUG) {
		Log.d(TAG, "onConnectedNotLocked sessionBinder=" + sessionBinder
		+ ", commands=" + commandGroup);
		+ ", allowedCommands=" + allowedCommands);
		}
		boolean close = false;
		try {
		if (sessionBinder == null \|\| commandGroup == null) {
		if (sessionBinder == null \|\| allowedCommands == null) {
		// Connection rejected.
		close = true;
		return;
		@@ -660,7 +697,7 @@ public class MediaController2Impl implements MediaController2Provider {
		close = true;
		return;
		}
		mCommandGroup = commandGroup;
		mAllowedCommands = allowedCommands;
		mPlaybackState = state;
		mPlaybackInfo = info;
		mPlaylistParams = params;
		@@ -684,7 +721,7 @@ public class MediaController2Impl implements MediaController2Provider {
		// Note: We may trigger ControllerCallbacks with the initial values
		// But it's hard to define the order of the controller callbacks
		// Only notify about the
		mCallback.onConnected(commandGroup);
		mCallback.onConnected(allowedCommands);
		});
		} finally {
		if (close) {

packages/MediaComponents/src/com/android/media/MediaSession2CallbackStub.java

+10 −7

Original line number	Diff line number	Diff line
		@@ -125,7 +125,7 @@ public class MediaSession2CallbackStub extends IMediaSession2Callback.Stub {
		@Override
		public void onConnected(IMediaSession2 sessionBinder, Bundle commandGroup,
		Bundle playbackState, Bundle playbackInfo, Bundle playlistParams, List<Bundle>
		playlist, PendingIntent sessionActivity) {
		itemBundleList, PendingIntent sessionActivity) {
		final MediaController2Impl controller = mController.get();
		if (controller == null) {
		if (DEBUG) {
		@@ -134,11 +134,14 @@ public class MediaSession2CallbackStub extends IMediaSession2Callback.Stub {
		return;
		}
		final Context context = controller.getContext();
		List<MediaItem2> list = new ArrayList<>();
		for (int i = 0; i < playlist.size(); i++) {
		MediaItem2 item = MediaItem2.fromBundle(context, playlist.get(i));
		List<MediaItem2> itemList = null;
		if (itemBundleList != null) {
		itemList = new ArrayList<>();
		for (int i = 0; i < itemBundleList.size(); i++) {
		MediaItem2 item = MediaItem2.fromBundle(context, itemBundleList.get(i));
		if (item != null) {
		list.add(item);
		itemList.add(item);
		}
		}
		}
		controller.onConnectedNotLocked(sessionBinder,
		@@ -146,7 +149,7 @@ public class MediaSession2CallbackStub extends IMediaSession2Callback.Stub {
		PlaybackState2.fromBundle(context, playbackState),
		PlaybackInfoImpl.fromBundle(context, playbackInfo),
		PlaylistParams.fromBundle(context, playlistParams),
		list, sessionActivity);
		itemList, sessionActivity);
		}

		@Override

packages/MediaComponents/src/com/android/media/MediaSession2Impl.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -807,7 +807,7 @@ public class MediaSession2Impl implements MediaSession2Provider {
		}

		/**
		* @ 7return a new Bundle instance from the Command
		* @return a new Bundle instance from the Command
		*/
		public Bundle toBundle_impl() {
		Bundle bundle = new Bundle();

packages/MediaComponents/src/com/android/media/MediaSession2Stub.java

+298 −251

File changed.

Preview size limit exceeded, changes collapsed.

packages/MediaComponents/test/src/android/media/MediaSession2Test.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -404,6 +404,10 @@ public class MediaSession2Test extends MediaSession2TestBase {
		.setId("testSetCustomLayout")
		.setSessionCallback(sHandlerExecutor, sessionCallback)
		.build()) {
		if (mSession != null) {
		mSession.close();
		mSession = session;
		}
		final TestControllerCallbackInterface callback = new TestControllerCallbackInterface() {
		@Override
		public void onCustomLayoutChanged(List<CommandButton> layout) {