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

Merge "MediaRouter: Enable transfer for RCN case" into rvc-dev am: c88b779af9 am: 4d3779d8b3

Browse Source 
Change-Id: Id9a3ef28c700fbeea6b2dde108a80b04dc904a39
This commit is contained in:
Kyunglyul Hyun
2020-04-08 06:40:23 +00:00
committed by Automerger Merge Worker
parent 08dc6d2ab3 4d3779d8b3
commit cbbb6a16e3
1 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -808,7 +808,7 @@ class MediaRouter2ServiceImpl {
return;
}
// Can be null if the session is system's.
// Can be null if the session is system's or RCN.
RouterRecord routerRecord = managerRecord.mUserRecord.mHandler
.findRouterforSessionLocked(uniqueSessionId);
@@ -829,7 +829,7 @@ class MediaRouter2ServiceImpl {
return;
}
// Can be null if the session is system's.
// Can be null if the session is system's or RCN.
RouterRecord routerRecord = managerRecord.mUserRecord.mHandler
.findRouterforSessionLocked(uniqueSessionId);
@@ -850,7 +850,7 @@ class MediaRouter2ServiceImpl {
return;
}
// Can be null if the session is system's.
// Can be null if the session is system's or RCN.
RouterRecord routerRecord = managerRecord.mUserRecord.mHandler
.findRouterforSessionLocked(uniqueSessionId);
@@ -1232,7 +1232,7 @@ class MediaRouter2ServiceImpl {
route.getOriginalId(), sessionHints);
}
// routerRecord can be null if the session is system's.
// routerRecord can be null if the session is system's or RCN.
private void selectRouteOnHandler(long uniqueRequestId, @Nullable RouterRecord routerRecord,
@NonNull String uniqueSessionId, @NonNull MediaRoute2Info route) {
if (!checkArgumentsForSessionControl(routerRecord, uniqueSessionId, route,
@@ -1250,7 +1250,7 @@ class MediaRouter2ServiceImpl {
route.getOriginalId());
}
// routerRecord can be null if the session is system's.
// routerRecord can be null if the session is system's or RCN.
private void deselectRouteOnHandler(long uniqueRequestId,
@Nullable RouterRecord routerRecord,
@NonNull String uniqueSessionId, @NonNull MediaRoute2Info route) {
@@ -1270,7 +1270,7 @@ class MediaRouter2ServiceImpl {
route.getOriginalId());
}
// routerRecord can be null if the session is system's.
// routerRecord can be null if the session is system's or RCN.
private void transferToRouteOnHandler(long uniqueRequestId,
@Nullable RouterRecord routerRecord,
@NonNull String uniqueSessionId, @NonNull MediaRoute2Info route) {
@@ -1289,6 +1289,8 @@ class MediaRouter2ServiceImpl {
route.getOriginalId());
}
// routerRecord is null if and only if the session is created without the request, which
// includes the system's session and RCN cases.
private boolean checkArgumentsForSessionControl(@Nullable RouterRecord routerRecord,
@NonNull String uniqueSessionId, @NonNull MediaRoute2Info route,
@NonNull String description) {
@@ -1305,12 +1307,6 @@ class MediaRouter2ServiceImpl {
return true;
}
//TODO(b/152950479): Handle RCN case.
if (routerRecord == null) {
Slog.w(TAG, "Ignoring " + description + " route from unknown router.");
return false;
}
RouterRecord matchingRecord = mSessionToRouterMap.get(uniqueSessionId);
if (matchingRecord != routerRecord) {
Slog.w(TAG, "Ignoring " + description + " route from non-matching router. "