Merge "Inline and remove redundant method" into main (13c40acd) · Commits · e / os / android_frameworks_base

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

+2 −10

Original line number	Original line	Diff line number	Diff line
	@@ -2700,11 +2700,8 @@ class MediaRouter2ServiceImpl {
	// session info from them.		// session info from them.
	sessionInfo = mSystemProvider.getDefaultSessionInfo();		sessionInfo = mSystemProvider.getDefaultSessionInfo();
	}		}
	// TODO: b/279555229 - replace with matchingRequest.mRouterRecord.notifySessionCreated.		matchingRequest.mRouterRecord.notifySessionCreated(
	notifySessionCreatedToRouter(		toOriginalRequestId(uniqueRequestId), sessionInfo);
	matchingRequest.mRouterRecord,
	toOriginalRequestId(uniqueRequestId),
	sessionInfo);
	}		}

	private void onSessionInfoChangedOnHandler(@NonNull MediaRoute2Provider provider,		private void onSessionInfoChangedOnHandler(@NonNull MediaRoute2Provider provider,
	@@ -2812,11 +2809,6 @@ class MediaRouter2ServiceImpl {
	return true;		return true;
	}		}

	private void notifySessionCreatedToRouter(@NonNull RouterRecord routerRecord,
	int requestId, @NonNull RoutingSessionInfo sessionInfo) {
	routerRecord.notifySessionCreated(requestId, sessionInfo);
	}

	private void notifySessionCreationFailedToRouter(@NonNull RouterRecord routerRecord,		private void notifySessionCreationFailedToRouter(@NonNull RouterRecord routerRecord,
	int requestId) {		int requestId) {
	try {		try {