Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Non-functional refactor to move logic into RouterRecord

Browse Source 
This allows a following CL that:
- Expands system routing permission.
- Allows to send route updates to a specific router.

This CL also removes an unused method.

Bug: 274894524
Test: atest CtsMediaBetterTogetherTestCases
Test: atest MediaRouter2HostSideTest
Change-Id: I8bc318e3ecee70b274ca260209d48b4fc76250a3
Merged-In: I8bc318e3ecee70b274ca260209d48b4fc76250a3
This commit is contained in:
Santiago Seifert
2023-05-09 20:05:36 +00:00
parent d96b5ba831
commit 9460705cb2
1 changed files with 57 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

113
services/core/java/com/android/server/media/MediaRouter2ServiceImpl.java
View File

@@ -915,7 +915,7 @@ class MediaRouter2ServiceImpl {
if (!TextUtils.equals(manager.mLastSessionCreationRequest.mRoute.getId(),
route.getId())) {
// When media router has no permission
if (!routerRecord.mHasModifyAudioRoutingPermission
if (!routerRecord.hasSystemRoutingPermission()
&& manager.mLastSessionCreationRequest.mRoute.isSystemRoute()
&& route.isSystemRoute()) {
route = manager.mLastSessionCreationRequest.mRoute;
@@ -929,9 +929,16 @@ class MediaRouter2ServiceImpl {
}
manager.mLastSessionCreationRequest = null;
} else {
if (route.isSystemRoute() && !routerRecord.mHasModifyAudioRoutingPermission
&& !TextUtils.equals(route.getId(),
routerRecord.mUserRecord.mHandler.mSystemProvider.getDefaultRoute().getId())) {
if (route.isSystemRoute()
&& !routerRecord.hasSystemRoutingPermission()
&& !TextUtils.equals(
route.getId(),
routerRecord
.mUserRecord
.mHandler
.mSystemProvider
.getDefaultRoute()
.getId())) {
Slog.w(TAG, "MODIFY_AUDIO_ROUTING permission is required to transfer to"
+ route);
routerRecord.mUserRecord.mHandler.notifySessionCreationFailedToRouter(
@@ -1007,7 +1014,8 @@ class MediaRouter2ServiceImpl {
String defaultRouteId =
routerRecord.mUserRecord.mHandler.mSystemProvider.getDefaultRoute().getId();
if (route.isSystemRoute() && !routerRecord.mHasModifyAudioRoutingPermission
if (route.isSystemRoute()
&& !routerRecord.hasSystemRoutingPermission()
&& !TextUtils.equals(route.getId(), defaultRouteId)) {
routerRecord.mUserRecord.mHandler.sendMessage(
obtainMessage(UserHandler::notifySessionCreationFailedToRouter,
@@ -1523,6 +1531,14 @@ class MediaRouter2ServiceImpl {
mRouterId = mNextRouterOrManagerId.getAndIncrement();
}
/**
* Returns whether the corresponding router has permission to query and control system
* routes.
*/
public boolean hasSystemRoutingPermission() {
return mHasModifyAudioRoutingPermission;
}
public void dispose() {
mRouter.asBinder().unlinkToDeath(this, 0);
}
@@ -1543,12 +1559,40 @@ class MediaRouter2ServiceImpl {
pw.println(indent + "mPid=" + mPid);
pw.println(indent + "mHasConfigureWifiDisplayPermission="
+ mHasConfigureWifiDisplayPermission);
pw.println(indent + "mHasModifyAudioRoutingPermission="
+ mHasModifyAudioRoutingPermission);
pw.println(indent + "hasSystemRoutingPermission=" + hasSystemRoutingPermission());
pw.println(indent + "mRouterId=" + mRouterId);
mDiscoveryPreference.dump(pw, indent);
}
/**
* Sends the corresponding router an {@link
* android.media.MediaRouter2.RouteCallback#onRoutesUpdated update} for the given {@code
* routes}.
*
* <p>Only the routes that are visible to the router are sent as part of the update.
*/
public void notifyRoutesUpdated(List<MediaRoute2Info> routes) {
try {
mRouter.notifyRoutesUpdated(getVisibleRoutes(routes));
} catch (RemoteException ex) {
Slog.w(TAG, "Failed to notify routes updated. Router probably died.", ex);
}
}
/**
* Returns a filtered copy of {@code routes} that contains only the routes that are {@link
* MediaRoute2Info#isVisibleTo visible} to the router corresponding to this record.
*/
private List<MediaRoute2Info> getVisibleRoutes(@NonNull List<MediaRoute2Info> routes) {
List<MediaRoute2Info> filteredRoutes = new ArrayList<>();
for (MediaRoute2Info route : routes) {
if (route.isVisibleTo(mPackageName)) {
filteredRoutes.add(route);
}
}
return filteredRoutes;
}
}
final class ManagerRecord implements IBinder.DeathRecipient {
@@ -1971,7 +2015,7 @@ class MediaRouter2ServiceImpl {
@NonNull RouterRecord routerRecord, @NonNull ManagerRecord managerRecord,
@NonNull RoutingSessionInfo oldSession, @NonNull MediaRoute2Info route) {
try {
if (route.isSystemRoute() && !routerRecord.mHasModifyAudioRoutingPermission) {
if (route.isSystemRoute() && !routerRecord.hasSystemRoutingPermission()) {
// The router lacks permission to modify system routing, so we hide system
// route info from them.
route = mSystemProvider.getDefaultRoute();
@@ -2190,7 +2234,7 @@ class MediaRouter2ServiceImpl {
mSessionToRouterMap.put(sessionInfo.getId(), matchingRequest.mRouterRecord);
if (sessionInfo.isSystemSession()
&& !matchingRequest.mRouterRecord.mHasModifyAudioRoutingPermission) {
&& !matchingRequest.mRouterRecord.hasSystemRoutingPermission()) {
// The router lacks permission to modify system routing, so we hide system routing
// session info from them.
sessionInfo = mSystemProvider.getDefaultSessionInfo();
@@ -2324,24 +2368,6 @@ class MediaRouter2ServiceImpl {
}
}
private List<IMediaRouter2> getRouters(boolean hasModifyAudioRoutingPermission) {
final List<IMediaRouter2> routers = new ArrayList<>();
MediaRouter2ServiceImpl service = mServiceRef.get();
if (service == null) {
return routers;
}
synchronized (service.mLock) {
for (RouterRecord routerRecord : mUserRecord.mRouterRecords) {
if (hasModifyAudioRoutingPermission
== routerRecord.mHasModifyAudioRoutingPermission) {
routers.add(routerRecord.mRouter);
}
routers.add(routerRecord.mRouter);
}
}
return routers;
}
private List<IMediaRouter2Manager> getManagers() {
final List<IMediaRouter2Manager> managers = new ArrayList<>();
MediaRouter2ServiceImpl service = mServiceRef.get();
@@ -2375,7 +2401,7 @@ class MediaRouter2ServiceImpl {
synchronized (service.mLock) {
for (RouterRecord routerRecord : mUserRecord.mRouterRecords) {
if (hasModifyAudioRoutingPermission
== routerRecord.mHasModifyAudioRoutingPermission) {
== routerRecord.hasSystemRoutingPermission()) {
routerRecords.add(routerRecord);
}
}
@@ -2408,7 +2434,7 @@ class MediaRouter2ServiceImpl {
}
RoutingSessionInfo currentSystemSessionInfo;
if (routerRecord.mHasModifyAudioRoutingPermission) {
if (routerRecord.hasSystemRoutingPermission()) {
if (systemProviderInfo != null) {
currentRoutes.addAll(systemProviderInfo.getRoutes());
} else {
@@ -2436,36 +2462,11 @@ class MediaRouter2ServiceImpl {
private static void notifyRoutesUpdatedToRouterRecords(
@NonNull List<RouterRecord> routerRecords,
@NonNull List<MediaRoute2Info> routes) {
for (RouterRecord routerRecord: routerRecords) {
List<MediaRoute2Info> filteredRoutes = getFilteredRoutesForPackageName(routes,
routerRecord.mPackageName);
try {
routerRecord.mRouter.notifyRoutesUpdated(filteredRoutes);
} catch (RemoteException ex) {
Slog.w(TAG, "Failed to notify routes updated. Router probably died.", ex);
}
for (RouterRecord routerRecord : routerRecords) {
routerRecord.notifyRoutesUpdated(routes);
}
}
/**
* Filters list of routes to return only public routes or routes provided by
* the same package name or routes containing this package name in its allow list.
* @param routes initial list of routes to be filtered.
* @param packageName router's package name to filter routes for it.
* @return only the routes that this package name is allowed to see.
*/
private static List<MediaRoute2Info> getFilteredRoutesForPackageName(
@NonNull List<MediaRoute2Info> routes,
@NonNull String packageName) {
List<MediaRoute2Info> filteredRoutes = new ArrayList<>();
for (MediaRoute2Info route : routes) {
if (route.isVisibleTo(packageName)) {
filteredRoutes.add(route);
}
}
return filteredRoutes;
}
private void notifySessionInfoChangedToRouters(
@NonNull List<RouterRecord> routerRecords,
@NonNull RoutingSessionInfo sessionInfo) {