MediaRoute2Provider: Revisit session related APIs (6e30f1ba) · Commits · e / os / android_frameworks_base

media/java/android/media/IMediaRoute2ProviderClient.aidl

+6 −4

Original line number	Original line	Diff line number	Diff line
	@@ -25,8 +25,10 @@ import android.os.Bundle;
	* @hide		* @hide
	*/		*/
	oneway interface IMediaRoute2ProviderClient {		oneway interface IMediaRoute2ProviderClient {
	void updateState(in MediaRoute2ProviderInfo providerInfo,		// TODO: Change it to updateRoutes?
	in List<RoutingSessionInfo> sessionInfos);		void updateState(in MediaRoute2ProviderInfo providerInfo);
	void notifySessionCreated(in @nullable RoutingSessionInfo sessionInfo, long requestId);		void notifySessionCreated(in RoutingSessionInfo sessionInfo, long requestId);
	void notifySessionInfoChanged(in RoutingSessionInfo sessionInfo);		void notifySessionCreationFailed(long requestId);
			void notifySessionUpdated(in RoutingSessionInfo sessionInfo);
			void notifySessionReleased(in RoutingSessionInfo sessionInfo);
	}		}

media/java/android/media/MediaRoute2ProviderService.java

+114 −86

Original line number	Original line	Diff line number	Diff line
	@@ -58,6 +58,16 @@ public abstract class MediaRoute2ProviderService extends Service {

	public static final String SERVICE_INTERFACE = "android.media.MediaRoute2ProviderService";		public static final String SERVICE_INTERFACE = "android.media.MediaRoute2ProviderService";

			/**
			* The request ID to pass {@link #notifySessionCreated(RoutingSessionInfo, long)}
			* when {@link MediaRoute2ProviderService} created a session although there was no creation
			* request.
			*
			* @see #notifySessionCreated(RoutingSessionInfo, long)
			* @hide
			*/
			public static final long REQUEST_ID_UNKNOWN = 0;

	private final Handler mHandler;		private final Handler mHandler;
	private final Object mSessionLock = new Object();		private final Object mSessionLock = new Object();
	private final AtomicBoolean mStatePublishScheduled = new AtomicBoolean(false);		private final AtomicBoolean mStatePublishScheduled = new AtomicBoolean(false);
	@@ -118,7 +128,7 @@ public abstract class MediaRoute2ProviderService extends Service {
	*		*
	* @param sessionId id of the session		* @param sessionId id of the session
	* @return information of the session with the given id.		* @return information of the session with the given id.
	* null if the session is destroyed or id is not valid.		* null if the session is released or ID is not valid.
	* @hide		* @hide
	*/		*/
	@Nullable		@Nullable
	@@ -143,161 +153,178 @@ public abstract class MediaRoute2ProviderService extends Service {
	}		}

	/**		/**
	* Updates the information of a session.		* Notifies clients of that the session is created and ready for use.
	* If the session is destroyed or not created before, it will be ignored.		* <p>
	* Call {@link #updateProviderInfo(MediaRoute2ProviderInfo)} to notify clients of		* If this session is created without any creation request, use {@link #REQUEST_ID_UNKNOWN}
	* session info changes.		* as the request ID.
	*		*
	* @param sessionInfo new session information		* @param sessionInfo information of the new session.
	* @see #notifySessionCreated(RoutingSessionInfo, long)		* The {@link RoutingSessionInfo#getId() id} of the session must be unique.
			* @param requestId id of the previous request to create this session provided in
			* {@link #onCreateSession(String, String, String, long)}
			* @see #onCreateSession(String, String, String, long)
	* @hide		* @hide
	*/		*/
	public final void updateSessionInfo(@NonNull RoutingSessionInfo sessionInfo) {		public final void notifySessionCreated(@NonNull RoutingSessionInfo sessionInfo,
			long requestId) {
	Objects.requireNonNull(sessionInfo, "sessionInfo must not be null");		Objects.requireNonNull(sessionInfo, "sessionInfo must not be null");
	String sessionId = sessionInfo.getId();

			String sessionId = sessionInfo.getId();
	synchronized (mSessionLock) {		synchronized (mSessionLock) {
	if (mSessionInfo.containsKey(sessionId)) {		if (mSessionInfo.containsKey(sessionId)) {
	mSessionInfo.put(sessionId, sessionInfo);		Log.w(TAG, "Ignoring duplicate session id.");
			return;
			}
			mSessionInfo.put(sessionInfo.getId(), sessionInfo);
			}
	schedulePublishState();		schedulePublishState();
	} else {
	Log.w(TAG, "Ignoring unknown session info.");		if (mClient == null) {
	return;		return;
	}		}
			try {
			// TODO: Calling binder calls in multiple thread may cause timing issue.
			// Consider to change implementations to avoid the problems.
			// For example, post binder calls, always send all sessions at once, etc.
			mClient.notifySessionCreated(sessionInfo, requestId);
			} catch (RemoteException ex) {
			Log.w(TAG, "Failed to notify session created.");
	}		}
	}		}

	/**		/**
	* Notifies the session is changed.		* Notifies clients of that the session could not be created.
	*		*
	* TODO: This method is temporary, only created for tests. Remove when the alternative is ready.		* @param requestId id of the previous request to create the session provided in
			* {@link #onCreateSession(String, String, String, long)}.
			* @see #onCreateSession(String, String, String, long)
	* @hide		* @hide
	*/		*/
	public final void notifySessionInfoChanged(@NonNull RoutingSessionInfo sessionInfo) {		public final void notifySessionCreationFailed(long requestId) {
	Objects.requireNonNull(sessionInfo, "sessionInfo must not be null");

	String sessionId = sessionInfo.getId();
	synchronized (mSessionLock) {
	if (mSessionInfo.containsKey(sessionId)) {
	mSessionInfo.put(sessionId, sessionInfo);
	} else {
	Log.w(TAG, "Ignoring unknown session info.");
	return;
	}
	}

	if (mClient == null) {		if (mClient == null) {
	return;		return;
	}		}
	try {		try {
	mClient.notifySessionInfoChanged(sessionInfo);		mClient.notifySessionCreationFailed(requestId);
	} catch (RemoteException ex) {		} catch (RemoteException ex) {
	Log.w(TAG, "Failed to notify session info changed.");		Log.w(TAG, "Failed to notify session creation failed.");
	}		}
	}		}

	/**		/**
	* Notifies clients of that the session is created and ready for use. If the session can be		* Notifies the existing session is updated. For example, when
	* controlled, pass a {@link Bundle} that contains how to control it.		* {@link RoutingSessionInfo#getSelectedRoutes() selected routes} are changed.
	*		*
	* @param sessionInfo information of the new session.
	* The {@link RoutingSessionInfo#getId() id} of the session must be
	* unique. Pass {@code null} to reject the request or inform clients that
	* session creation is failed.
	* @param requestId id of the previous request to create this session
	* @hide		* @hide
	*/		*/
	// TODO: fail reason?		public final void notifySessionUpdated(@NonNull RoutingSessionInfo sessionInfo) {
	// TODO: Maybe better to create notifySessionCreationFailed?		Objects.requireNonNull(sessionInfo, "sessionInfo must not be null");
	public final void notifySessionCreated(@Nullable RoutingSessionInfo sessionInfo,
	long requestId) {
	if (sessionInfo != null) {
	String sessionId = sessionInfo.getId();		String sessionId = sessionInfo.getId();
	synchronized (mSessionLock) {		synchronized (mSessionLock) {
	if (mSessionInfo.containsKey(sessionId)) {		if (mSessionInfo.containsKey(sessionId)) {
	Log.w(TAG, "Ignoring duplicate session id.");		mSessionInfo.put(sessionId, sessionInfo);
			} else {
			Log.w(TAG, "Ignoring unknown session info.");
	return;		return;
	}		}
	mSessionInfo.put(sessionInfo.getId(), sessionInfo);
	}
	schedulePublishState();
	}		}

	if (mClient == null) {		if (mClient == null) {
	return;		return;
	}		}
	try {		try {
	mClient.notifySessionCreated(sessionInfo, requestId);		mClient.notifySessionUpdated(sessionInfo);
	} catch (RemoteException ex) {		} catch (RemoteException ex) {
	Log.w(TAG, "Failed to notify session created.");		Log.w(TAG, "Failed to notify session info changed.");
	}		}
	}		}

	/**		/**
	* Releases a session with the given id.		* Notifies that the session is released.
	* {@link #onDestroySession} is called if the session is released.
	*		*
	* @param sessionId id of the session to be released		* @param sessionId id of the released session.
	* @see #onDestroySession(String, RoutingSessionInfo)		* @see #onReleaseSession(String)
	* @hide		* @hide
	*/		*/
	public final void releaseSession(@NonNull String sessionId) {		public final void notifySessionReleased(@NonNull String sessionId) {
	if (TextUtils.isEmpty(sessionId)) {		if (TextUtils.isEmpty(sessionId)) {
	throw new IllegalArgumentException("sessionId must not be empty");		throw new IllegalArgumentException("sessionId must not be empty");
	}		}
	//TODO: notify media router service of release.
	RoutingSessionInfo sessionInfo;		RoutingSessionInfo sessionInfo;
	synchronized (mSessionLock) {		synchronized (mSessionLock) {
	sessionInfo = mSessionInfo.remove(sessionId);		sessionInfo = mSessionInfo.remove(sessionId);
	}		}
	if (sessionInfo != null) {
	mHandler.sendMessage(obtainMessage(		if (sessionInfo == null) {
	MediaRoute2ProviderService::onDestroySession, this, sessionId, sessionInfo));		Log.w(TAG, "Ignoring unknown session info.");
	schedulePublishState();		return;
			}

			if (mClient == null) {
			return;
			}
			try {
			mClient.notifySessionReleased(sessionInfo);
			} catch (RemoteException ex) {
			Log.w(TAG, "Failed to notify session info changed.");
	}		}
	}		}

	/**		/**
	* Called when a session should be created.		* Called when the service receives a request to create a session.
			* <p>
	* You should create and maintain your own session and notifies the client of		* You should create and maintain your own session and notifies the client of
	* session info. Call {@link #notifySessionCreated(RoutingSessionInfo, long)}		* session info. Call {@link #notifySessionCreated(RoutingSessionInfo, long)}
	* with the given {@code requestId} to notify the information of a new session.		* with the given {@code requestId} to notify the information of a new session.
	* If you can't create the session or want to reject the request, pass {@code null}		* The created session must have the same route feature and must include the given route
	* as session info in {@link #notifySessionCreated(RoutingSessionInfo, long)}		* specified by {@code routeId}.
	* with the given {@code requestId}.		* <p>
			* If the session can be controlled, you can optionally pass the control hints to
			* {@link RoutingSessionInfo.Builder#setControlHints(Bundle)}. Control hints is a
			* {@link Bundle} which contains how to control the session.
			* <p>
			* If you can't create the session or want to reject the request, call
			* {@link #notifySessionCreationFailed(long)} with the given {@code requestId}.
	*		*
	* @param packageName the package name of the application that selected the route		* @param packageName the package name of the application that selected the route
	* @param routeId the id of the route initially being connected		* @param routeId the id of the route initially being connected
	* @param routeFeature the route feature of the new session		* @param routeFeature the route feature of the new session
	* @param requestId the id of this session creation request		* @param requestId the id of this session creation request
			*
			* @see RoutingSessionInfo.Builder#Builder(String, String, String)
			* @see RoutingSessionInfo.Builder#addSelectedRoute(String)
			* @see RoutingSessionInfo.Builder#setControlHints(Bundle)
	* @hide		* @hide
	*/		*/
	public abstract void onCreateSession(@NonNull String packageName, @NonNull String routeId,		public abstract void onCreateSession(@NonNull String packageName, @NonNull String routeId,
	@NonNull String routeFeature, long requestId);		@NonNull String routeFeature, long requestId);

	/**		/**
	* Called when a session is about to be destroyed.		* Called when the session should be released. A client of the session or system can request
	* You can clean up your session here. This can happen by the		* a session to be released.
	* client or provider itself.		* <p>
			* After releasing the session, call {@link #notifySessionReleased(String)}
			* with the ID of the released session.
			*
			* Note: Calling {@link #notifySessionReleased(String)} will <em>NOT</em> trigger
			* this method to be called.
	*		*
	* @param sessionId id of the session being destroyed.		* @param sessionId id of the session being released.
	* @param lastSessionInfo information of the session being destroyed.		* @see #notifySessionReleased(String)
	* @see #releaseSession(String)		* @see #getSessionInfo(String)
	* @hide		* @hide
	*/		*/
	public abstract void onDestroySession(@NonNull String sessionId,		public abstract void onReleaseSession(@NonNull String sessionId);
	@NonNull RoutingSessionInfo lastSessionInfo);

	//TODO: make a way to reject the request		//TODO: make a way to reject the request
	/**		/**
	* Called when a client requests selecting a route for the session.		* Called when a client requests selecting a route for the session.
	* After the route is selected, call {@link #updateSessionInfo(RoutingSessionInfo)} to update		* After the route is selected, call {@link #notifySessionUpdated(RoutingSessionInfo)}
	* session info and call {@link #updateProviderInfo(MediaRoute2ProviderInfo)} to notify		* to update session info.
	* clients of updated session info.
	*		*
	* @param sessionId id of the session		* @param sessionId id of the session
	* @param routeId id of the route		* @param routeId id of the route
	* @see #updateSessionInfo(RoutingSessionInfo)
	* @hide		* @hide
	*/		*/
	public abstract void onSelectRoute(@NonNull String sessionId, @NonNull String routeId);		public abstract void onSelectRoute(@NonNull String sessionId, @NonNull String routeId);
	@@ -305,9 +332,8 @@ public abstract class MediaRoute2ProviderService extends Service {
	//TODO: make a way to reject the request		//TODO: make a way to reject the request
	/**		/**
	* Called when a client requests deselecting a route from the session.		* Called when a client requests deselecting a route from the session.
	* After the route is deselected, call {@link #updateSessionInfo(RoutingSessionInfo)} to update		* After the route is deselected, call {@link #notifySessionUpdated(RoutingSessionInfo)}
	* session info and call {@link #updateProviderInfo(MediaRoute2ProviderInfo)} to notify		* to update session info.
	* clients of updated session info.
	*		*
	* @param sessionId id of the session		* @param sessionId id of the session
	* @param routeId id of the route		* @param routeId id of the route
	@@ -318,9 +344,8 @@ public abstract class MediaRoute2ProviderService extends Service {
	//TODO: make a way to reject the request		//TODO: make a way to reject the request
	/**		/**
	* Called when a client requests transferring a session to a route.		* Called when a client requests transferring a session to a route.
	* After the transfer is finished, call {@link #updateSessionInfo(RoutingSessionInfo)} to update		* After the transfer is finished, call {@link #notifySessionUpdated(RoutingSessionInfo)}
	* session info and call {@link #updateProviderInfo(MediaRoute2ProviderInfo)} to notify		* to update session info.
	* clients of updated session info.
	*		*
	* @param sessionId id of the session		* @param sessionId id of the session
	* @param routeId id of the route		* @param routeId id of the route
	@@ -344,6 +369,8 @@ public abstract class MediaRoute2ProviderService extends Service {
	* </p>		* </p>
	*		*
	* @param preference the new discovery preference		* @param preference the new discovery preference
			*
			* TODO: This method needs tests.
	*/		*/
	public void onDiscoveryPreferenceChanged(@NonNull RouteDiscoveryPreference preference) {}		public void onDiscoveryPreferenceChanged(@NonNull RouteDiscoveryPreference preference) {}

	@@ -383,7 +410,7 @@ public abstract class MediaRoute2ProviderService extends Service {
	sessionInfos = new ArrayList<>(mSessionInfo.values());		sessionInfos = new ArrayList<>(mSessionInfo.values());
	}		}
	try {		try {
	mClient.updateState(mProviderInfo, sessionInfos);		mClient.updateState(mProviderInfo);
	} catch (RemoteException ex) {		} catch (RemoteException ex) {
	Log.w(TAG, "Failed to send onProviderInfoUpdated");		Log.w(TAG, "Failed to send onProviderInfoUpdated");
	}		}
	@@ -415,6 +442,7 @@ public abstract class MediaRoute2ProviderService extends Service {
	MediaRoute2ProviderService.this, packageName, routeId, routeFeature,		MediaRoute2ProviderService.this, packageName, routeId, routeFeature,
	requestId));		requestId));
	}		}

	@Override		@Override
	public void releaseSession(@NonNull String sessionId) {		public void releaseSession(@NonNull String sessionId) {
	if (!checkCallerisSystem()) {		if (!checkCallerisSystem()) {
	@@ -424,7 +452,7 @@ public abstract class MediaRoute2ProviderService extends Service {
	Log.w(TAG, "releaseSession: Ignoring empty sessionId from system service.");		Log.w(TAG, "releaseSession: Ignoring empty sessionId from system service.");
	return;		return;
	}		}
	mHandler.sendMessage(obtainMessage(MediaRoute2ProviderService::releaseSession,		mHandler.sendMessage(obtainMessage(MediaRoute2ProviderService::onReleaseSession,
	MediaRoute2ProviderService.this, sessionId));		MediaRoute2ProviderService.this, sessionId));
	}		}

media/tests/MediaRouteProvider/src/com/android/mediarouteprovider/example/SampleMediaRoute2ProviderService.java

+13 −10

Original line number	Original line	Diff line number	Diff line
	@@ -172,7 +172,7 @@ public class SampleMediaRoute2ProviderService extends MediaRoute2ProviderService
	MediaRoute2Info route = mRoutes.get(routeId);		MediaRoute2Info route = mRoutes.get(routeId);
	if (route == null \|\| TextUtils.equals(ROUTE_ID3_SESSION_CREATION_FAILED, routeId)) {		if (route == null \|\| TextUtils.equals(ROUTE_ID3_SESSION_CREATION_FAILED, routeId)) {
	// Tell the router that session cannot be created by passing null as sessionInfo.		// Tell the router that session cannot be created by passing null as sessionInfo.
	notifySessionCreated(/* sessionInfo= */ null, requestId);		notifySessionCreationFailed(requestId);
	return;		return;
	}		}
	maybeDeselectRoute(routeId);		maybeDeselectRoute(routeId);
	@@ -196,8 +196,13 @@ public class SampleMediaRoute2ProviderService extends MediaRoute2ProviderService
	}		}

	@Override		@Override
	public void onDestroySession(String sessionId, RoutingSessionInfo lastSessionInfo) {		public void onReleaseSession(String sessionId) {
	for (String routeId : lastSessionInfo.getSelectedRoutes()) {		RoutingSessionInfo sessionInfo = getSessionInfo(sessionId);
			if (sessionInfo == null) {
			return;
			}

			for (String routeId : sessionInfo.getSelectedRoutes()) {
	mRouteIdToSessionId.remove(routeId);		mRouteIdToSessionId.remove(routeId);
	MediaRoute2Info route = mRoutes.get(routeId);		MediaRoute2Info route = mRoutes.get(routeId);
	if (route != null) {		if (route != null) {
	@@ -206,6 +211,7 @@ public class SampleMediaRoute2ProviderService extends MediaRoute2ProviderService
	.build());		.build());
	}		}
	}		}
			notifySessionReleased(sessionId);
	}		}

	@Override		@Override
	@@ -227,8 +233,7 @@ public class SampleMediaRoute2ProviderService extends MediaRoute2ProviderService
	.removeSelectableRoute(routeId)		.removeSelectableRoute(routeId)
	.addDeselectableRoute(routeId)		.addDeselectableRoute(routeId)
	.build();		.build();
	updateSessionInfo(newSessionInfo);		notifySessionUpdated(newSessionInfo);
	notifySessionInfoChanged(newSessionInfo);
	}		}

	@Override		@Override
	@@ -247,7 +252,7 @@ public class SampleMediaRoute2ProviderService extends MediaRoute2ProviderService
	.build());		.build());

	if (sessionInfo.getSelectedRoutes().size() == 1) {		if (sessionInfo.getSelectedRoutes().size() == 1) {
	releaseSession(sessionId);		notifySessionReleased(sessionId);
	return;		return;
	}		}

	@@ -256,8 +261,7 @@ public class SampleMediaRoute2ProviderService extends MediaRoute2ProviderService
	.addSelectableRoute(routeId)		.addSelectableRoute(routeId)
	.removeDeselectableRoute(routeId)		.removeDeselectableRoute(routeId)
	.build();		.build();
	updateSessionInfo(newSessionInfo);		notifySessionUpdated(newSessionInfo);
	notifySessionInfoChanged(newSessionInfo);
	}		}

	@Override		@Override
	@@ -269,8 +273,7 @@ public class SampleMediaRoute2ProviderService extends MediaRoute2ProviderService
	.removeDeselectableRoute(routeId)		.removeDeselectableRoute(routeId)
	.removeTransferrableRoute(routeId)		.removeTransferrableRoute(routeId)
	.build();		.build();
	updateSessionInfo(newSessionInfo);		notifySessionUpdated(newSessionInfo);
	notifySessionInfoChanged(newSessionInfo);
	}		}

	void maybeDeselectRoute(String routeId) {		void maybeDeselectRoute(String routeId) {

services/core/java/com/android/server/media/MediaRoute2Provider.java

+14 −19

Original line number	Original line	Diff line number	Diff line
	@@ -23,18 +23,22 @@ import android.content.Intent;
	import android.media.MediaRoute2ProviderInfo;		import android.media.MediaRoute2ProviderInfo;
	import android.media.RoutingSessionInfo;		import android.media.RoutingSessionInfo;

			import com.android.internal.annotations.GuardedBy;

	import java.util.ArrayList;		import java.util.ArrayList;
	import java.util.Collections;
	import java.util.List;		import java.util.List;
	import java.util.Objects;		import java.util.Objects;

	abstract class MediaRoute2Provider {		abstract class MediaRoute2Provider {
	final ComponentName mComponentName;		final ComponentName mComponentName;
	final String mUniqueId;		final String mUniqueId;
			final Object mLock = new Object();

	Callback mCallback;		Callback mCallback;
	private volatile MediaRoute2ProviderInfo mProviderInfo;		private volatile MediaRoute2ProviderInfo mProviderInfo;
	private volatile List<RoutingSessionInfo> mSessionInfos = Collections.emptyList();
			@GuardedBy("mLock")
			final List<RoutingSessionInfo> mSessionInfos = new ArrayList<>();

	MediaRoute2Provider(@NonNull ComponentName componentName) {		MediaRoute2Provider(@NonNull ComponentName componentName) {
	mComponentName = Objects.requireNonNull(componentName, "Component name must not be null.");		mComponentName = Objects.requireNonNull(componentName, "Component name must not be null.");
	@@ -69,11 +73,12 @@ abstract class MediaRoute2Provider {

	@NonNull		@NonNull
	public List<RoutingSessionInfo> getSessionInfos() {		public List<RoutingSessionInfo> getSessionInfos() {
			synchronized (mLock) {
	return mSessionInfos;		return mSessionInfos;
	}		}
			}

	void setProviderState(MediaRoute2ProviderInfo providerInfo,		void setProviderState(MediaRoute2ProviderInfo providerInfo) {
	List<RoutingSessionInfo> sessionInfos) {
	if (providerInfo == null) {		if (providerInfo == null) {
	mProviderInfo = null;		mProviderInfo = null;
	} else {		} else {
	@@ -81,14 +86,6 @@ abstract class MediaRoute2Provider {
	.setUniqueId(mUniqueId)		.setUniqueId(mUniqueId)
	.build();		.build();
	}		}
	List<RoutingSessionInfo> sessionInfoWithProviderId = new ArrayList<RoutingSessionInfo>();
	for (RoutingSessionInfo sessionInfo : sessionInfos) {
	sessionInfoWithProviderId.add(
	new RoutingSessionInfo.Builder(sessionInfo)
	.setProviderId(mUniqueId)
	.build());
	}
	mSessionInfos = sessionInfoWithProviderId;
	}		}

	void notifyProviderState() {		void notifyProviderState() {
	@@ -97,9 +94,8 @@ abstract class MediaRoute2Provider {
	}		}
	}		}

	void setAndNotifyProviderState(MediaRoute2ProviderInfo providerInfo,		void setAndNotifyProviderState(MediaRoute2ProviderInfo providerInfo) {
	List<RoutingSessionInfo> sessionInfos) {		setProviderState(providerInfo);
	setProviderState(providerInfo, sessionInfos);
	notifyProviderState();		notifyProviderState();
	}		}

	@@ -112,10 +108,9 @@ abstract class MediaRoute2Provider {
	void onProviderStateChanged(@Nullable MediaRoute2Provider provider);		void onProviderStateChanged(@Nullable MediaRoute2Provider provider);
	void onSessionCreated(@NonNull MediaRoute2Provider provider,		void onSessionCreated(@NonNull MediaRoute2Provider provider,
	@Nullable RoutingSessionInfo sessionInfo, long requestId);		@Nullable RoutingSessionInfo sessionInfo, long requestId);
	// TODO: Remove this when MediaRouter2ServiceImpl notifies clients of session changes.		void onSessionCreationFailed(@NonNull MediaRoute2Provider provider, long requestId);
	void onSessionInfoChanged(@NonNull MediaRoute2Provider provider,		void onSessionUpdated(@NonNull MediaRoute2Provider provider,
	@NonNull RoutingSessionInfo sessionInfo);		@NonNull RoutingSessionInfo sessionInfo);
	// TODO: Call this when service actually notifies of session release.
	void onSessionReleased(@NonNull MediaRoute2Provider provider,		void onSessionReleased(@NonNull MediaRoute2Provider provider,
	@NonNull RoutingSessionInfo sessionInfo);		@NonNull RoutingSessionInfo sessionInfo);
	}		}

services/core/java/com/android/server/media/MediaRoute2ProviderProxy.java

+128 −29

File changed.

Preview size limit exceeded, changes collapsed.