Merge "Remove getSystemProviderForUser function" into main (281e0372) · Commits · e / os / android_frameworks_base

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

+10 −18

Original line number	Original line	Diff line number	Diff line
	@@ -221,11 +221,6 @@ class MediaRouter2ServiceImpl {
	}		}
	}		}

	@NonNull
	private SystemMediaRoute2Provider getSystemProviderForUser(@NonNull UserHandler userHandler) {
	return userHandler.mSystemProvider;
	}

	// Start of methods that implement MediaRouter2 operations.		// Start of methods that implement MediaRouter2 operations.

	@NonNull		@NonNull
	@@ -251,7 +246,7 @@ class MediaRouter2ServiceImpl {
	UserRecord userRecord = getOrCreateUserRecordLocked(userId);		UserRecord userRecord = getOrCreateUserRecordLocked(userId);
	if (hasSystemRoutingPermissions) {		if (hasSystemRoutingPermissions) {
	MediaRoute2ProviderInfo providerInfo =		MediaRoute2ProviderInfo providerInfo =
	getSystemProviderForUser(userRecord.mHandler).getProviderInfo();		userRecord.mHandler.getSystemProvider().getProviderInfo();
	if (providerInfo != null) {		if (providerInfo != null) {
	systemRoutes = providerInfo.getRoutes();		systemRoutes = providerInfo.getRoutes();
	} else {		} else {
	@@ -264,7 +259,7 @@ class MediaRouter2ServiceImpl {
	} else {		} else {
	systemRoutes = new ArrayList<>();		systemRoutes = new ArrayList<>();
	systemRoutes.add(		systemRoutes.add(
	getSystemProviderForUser(userRecord.mHandler).getDefaultRoute());		userRecord.mHandler.getSystemProvider().getDefaultRoute());
	}		}
	}		}
	return new ArrayList<>(systemRoutes);		return new ArrayList<>(systemRoutes);
	@@ -856,11 +851,10 @@ class MediaRouter2ServiceImpl {
	if (setDeviceRouteSelected) {		if (setDeviceRouteSelected) {
	// Return a fake system session that shows the device route as selected and		// Return a fake system session that shows the device route as selected and
	// available bluetooth routes as transferable.		// available bluetooth routes as transferable.
	return getSystemProviderForUser(userRecord.mHandler)		return userRecord.mHandler.getSystemProvider()
	.generateDeviceRouteSelectedSessionInfo(targetPackageName);		.generateDeviceRouteSelectedSessionInfo(targetPackageName);
	} else {		} else {
	sessionInfos = getSystemProviderForUser(userRecord.mHandler)		sessionInfos = userRecord.mHandler.getSystemProvider().getSessionInfos();
	.getSessionInfos();
	if (!sessionInfos.isEmpty()) {		if (!sessionInfos.isEmpty()) {
	// Return a copy of the current system session with no modification,		// Return a copy of the current system session with no modification,
	// except setting the client package name.		// except setting the client package name.
	@@ -873,8 +867,7 @@ class MediaRouter2ServiceImpl {
	}		}
	} else {		} else {
	return new RoutingSessionInfo.Builder(		return new RoutingSessionInfo.Builder(
	getSystemProviderForUser(userRecord.mHandler)		userRecord.mHandler.getSystemProvider().getDefaultSessionInfo())
	.getDefaultSessionInfo())
	.setClientPackageName(targetPackageName)		.setClientPackageName(targetPackageName)
	.build();		.build();
	}		}
	@@ -1383,7 +1376,7 @@ class MediaRouter2ServiceImpl {
	}		}
	manager.mLastSessionCreationRequest = null;		manager.mLastSessionCreationRequest = null;
	} else {		} else {
	String defaultRouteId = getSystemProviderForUser(userHandler).getDefaultRoute().getId();		String defaultRouteId = userHandler.getSystemProvider().getDefaultRoute().getId();
	if (route.isSystemRoute()		if (route.isSystemRoute()
	&& !routerRecord.hasSystemRoutingPermission()		&& !routerRecord.hasSystemRoutingPermission()
	&& !TextUtils.equals(route.getId(), defaultRouteId)) {		&& !TextUtils.equals(route.getId(), defaultRouteId)) {
	@@ -1471,7 +1464,7 @@ class MediaRouter2ServiceImpl {
	routerRecord.mPackageName, routerRecord.mRouterId, route.getId()));		routerRecord.mPackageName, routerRecord.mRouterId, route.getId()));

	UserHandler userHandler = routerRecord.mUserRecord.mHandler;		UserHandler userHandler = routerRecord.mUserRecord.mHandler;
	String defaultRouteId = getSystemProviderForUser(userHandler).getDefaultRoute().getId();		String defaultRouteId = userHandler.getSystemProvider().getDefaultRoute().getId();
	if (route.isSystemRoute()		if (route.isSystemRoute()
	&& !routerRecord.hasSystemRoutingPermission()		&& !routerRecord.hasSystemRoutingPermission()
	&& !TextUtils.equals(route.getId(), defaultRouteId)) {		&& !TextUtils.equals(route.getId(), defaultRouteId)) {
	@@ -2137,12 +2130,11 @@ class MediaRouter2ServiceImpl {
	notifyRoutesUpdated(routesToReport.values().stream().toList());		notifyRoutesUpdated(routesToReport.values().stream().toList());

	List<RoutingSessionInfo> sessionInfos =		List<RoutingSessionInfo> sessionInfos =
	getSystemProviderForUser(mUserRecord.mHandler).getSessionInfos();		mUserRecord.mHandler.getSystemProvider().getSessionInfos();
	RoutingSessionInfo systemSessionToReport =		RoutingSessionInfo systemSessionToReport =
	newSystemRoutingPermissionValue && !sessionInfos.isEmpty()		newSystemRoutingPermissionValue && !sessionInfos.isEmpty()
	? sessionInfos.get(0)		? sessionInfos.get(0)
	: getSystemProviderForUser(mUserRecord.mHandler)		: mUserRecord.mHandler.getSystemProvider().getDefaultSessionInfo();
	.getDefaultSessionInfo();
	notifySessionInfoChanged(systemSessionToReport);		notifySessionInfoChanged(systemSessionToReport);
	}		}
	}		}
	@@ -2292,7 +2284,7 @@ class MediaRouter2ServiceImpl {
	if (route.isSystemRoute() && !hasSystemRoutingPermission()) {		if (route.isSystemRoute() && !hasSystemRoutingPermission()) {
	// The router lacks permission to modify system routing, so we hide system		// The router lacks permission to modify system routing, so we hide system
	// route info from them.		// route info from them.
	route = getSystemProviderForUser(mUserRecord.mHandler).getDefaultRoute();		route = mUserRecord.mHandler.getSystemProvider().getDefaultRoute();
	}		}
	mRouter.requestCreateSessionByManager(uniqueRequestId, oldSession, route);		mRouter.requestCreateSessionByManager(uniqueRequestId, oldSession, route);
	} catch (RemoteException ex) {		} catch (RemoteException ex) {