Merge "Remove dead code related to playback suitability" into main (b13dab2a) · Commits · e / os / android_frameworks_base

media/java/android/media/IMediaRouterService.aidl

+1 −2

Original line number	Diff line number	Diff line
		@@ -85,8 +85,7 @@ interface IMediaRouterService {
		void updateScanningState(IMediaRouter2Manager manager, @JavaPassthrough(annotation="@android.media.MediaRouter2.ScanningState") int scanningState);

		void requestCreateSessionWithManager(IMediaRouter2Manager manager, int requestId,
		in RoutingSessionInfo oldSession, in @nullable MediaRoute2Info route,
		in UserHandle transferInitiatorUserHandle, in String transferInitiatorPackageName);
		in RoutingSessionInfo oldSession, in @nullable MediaRoute2Info route);
		void selectRouteWithManager(IMediaRouter2Manager manager, int requestId,
		String sessionId, in MediaRoute2Info route);
		void deselectRouteWithManager(IMediaRouter2Manager manager, int requestId,

+3 −11

Original line number	Diff line number	Diff line
		@@ -2770,7 +2770,7 @@ public final class MediaRouter2 {
		\|\| isSystemRouteReselection) {
		transferToRoute(sessionInfo, route, mClientUser, mClientPackageName);
		} else {
		requestCreateSession(sessionInfo, route, mClientUser, mClientPackageName);
		requestCreateSession(sessionInfo, route);
		}
		}

		@@ -2826,10 +2826,7 @@ public final class MediaRouter2 {
		* @param route The {@link MediaRoute2Info route} to transfer to.
		*/
		private void requestCreateSession(
		@NonNull RoutingSessionInfo oldSession,
		@NonNull MediaRoute2Info route,
		@NonNull UserHandle transferInitiatorUserHandle,
		@NonNull String transferInitiatorPackageName) {
		@NonNull RoutingSessionInfo oldSession, @NonNull MediaRoute2Info route) {
		if (TextUtils.isEmpty(oldSession.getClientPackageName())) {
		Log.w(TAG, "requestCreateSession: Can't create a session without package name.");
		this.onTransferFailed(oldSession, route);
		@@ -2840,12 +2837,7 @@ public final class MediaRouter2 {

		try {
		mMediaRouterService.requestCreateSessionWithManager(
		mClient,
		requestId,
		oldSession,
		route,
		transferInitiatorUserHandle,
		transferInitiatorPackageName);
		mClient, requestId, oldSession, route);
		} catch (RemoteException ex) {
		throw ex.rethrowFromSystemServer();
		}

+3 −7

Original line number	Diff line number	Diff line
		@@ -524,8 +524,7 @@ public final class MediaRouter2Manager {
		transferToRoute(
		sessionInfo, route, transferInitiatorUserHandle, transferInitiatorPackageName);
		} else {
		requestCreateSession(sessionInfo, route, transferInitiatorUserHandle,
		transferInitiatorPackageName);
		requestCreateSession(sessionInfo, route);
		}
		}

		@@ -914,9 +913,7 @@ public final class MediaRouter2Manager {
		}
		}

		private void requestCreateSession(RoutingSessionInfo oldSession, MediaRoute2Info route,
		@NonNull UserHandle transferInitiatorUserHandle,
		@NonNull String transferInitiationPackageName) {
		private void requestCreateSession(RoutingSessionInfo oldSession, MediaRoute2Info route) {
		if (TextUtils.isEmpty(oldSession.getClientPackageName())) {
		Log.w(TAG, "requestCreateSession: Can't create a session without package name.");
		notifyTransferFailed(oldSession, route);
		@@ -927,8 +924,7 @@ public final class MediaRouter2Manager {

		try {
		mMediaRouterService.requestCreateSessionWithManager(
		mClient, requestId, oldSession, route, transferInitiatorUserHandle,
		transferInitiationPackageName);
		mClient, requestId, oldSession, route);
		} catch (RemoteException ex) {
		throw ex.rethrowFromSystemServer();
		}

+3 −14

Original line number	Diff line number	Diff line
		@@ -677,24 +677,15 @@ class MediaRouter2ServiceImpl {
		@NonNull IMediaRouter2Manager manager,
		int requestId,
		@NonNull RoutingSessionInfo oldSession,
		@NonNull MediaRoute2Info route,
		@NonNull UserHandle transferInitiatorUserHandle,
		@NonNull String transferInitiatorPackageName) {
		@NonNull MediaRoute2Info route) {
		Objects.requireNonNull(manager, "manager must not be null");
		Objects.requireNonNull(oldSession, "oldSession must not be null");
		Objects.requireNonNull(route, "route must not be null");
		Objects.requireNonNull(transferInitiatorUserHandle);

		final long token = Binder.clearCallingIdentity();
		try {
		synchronized (mLock) {
		requestCreateSessionWithManagerLocked(
		requestId,
		manager,
		oldSession,
		route,
		transferInitiatorUserHandle,
		transferInitiatorPackageName);
		requestCreateSessionWithManagerLocked(requestId, manager, oldSession, route);
		}
		} finally {
		Binder.restoreCallingIdentity(token);
		@@ -1738,9 +1729,7 @@ class MediaRouter2ServiceImpl {
		int requestId,
		@NonNull IMediaRouter2Manager manager,
		@NonNull RoutingSessionInfo oldSession,
		@NonNull MediaRoute2Info route,
		@NonNull UserHandle transferInitiatorUserHandle,
		@NonNull String transferInitiatorPackageName) {
		@NonNull MediaRoute2Info route) {
		ManagerRecord managerRecord = mAllManagerRecords.get(manager.asBinder());
		if (managerRecord == null) {
		return;

+2 −10

Original line number	Diff line number	Diff line
		@@ -607,16 +607,8 @@ public final class MediaRouterService extends IMediaRouterService.Stub
		IMediaRouter2Manager manager,
		int requestId,
		RoutingSessionInfo oldSession,
		MediaRoute2Info route,
		UserHandle transferInitiatorUserHandle,
		String transferInitiatorPackageName) {
		mService2.requestCreateSessionWithManager(
		manager,
		requestId,
		oldSession,
		route,
		transferInitiatorUserHandle,
		transferInitiatorPackageName);
		MediaRoute2Info route) {
		mService2.requestCreateSessionWithManager(manager, requestId, oldSession, route);
		}

		// Binder call