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

Merge "Add MediaRouterManager.Callback#onSessionReleased" into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-06-09 06:10:19 +00:00
committed by Android (Google) Code Review
parent 4ca1fdf950 fe7b5b125b
commit 2950ebf07d
4 changed files with 95 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
media/java/android/media/IMediaRouter2Manager.aidl
View File

@@ -24,8 +24,9 @@ import android.media.RoutingSessionInfo;
* {@hide}
*/
oneway interface IMediaRouter2Manager {
void notifySessionCreated(int requestId, in RoutingSessionInfo sessionInfo);
void notifySessionUpdated(in RoutingSessionInfo sessionInfo);
void notifySessionCreated(int requestId, in RoutingSessionInfo session);
void notifySessionUpdated(in RoutingSessionInfo session);
void notifySessionReleased(in RoutingSessionInfo session);
void notifyPreferredFeaturesChanged(String packageName, in List<String> preferredFeatures);
void notifyRoutesAdded(in List<MediaRoute2Info> routes);
void notifyRoutesRemoved(in List<MediaRoute2Info> routes);

35
media/java/android/media/MediaRouter2Manager.java
View File

@@ -509,7 +509,7 @@ public final class MediaRouter2Manager {
notifyRequestFailed(reason);
}
void handleSessionsUpdated(RoutingSessionInfo sessionInfo) {
void handleSessionsUpdatedOnHandler(RoutingSessionInfo sessionInfo) {
for (TransferRequest request : mTransferRequests) {
String sessionId = request.mOldSessionInfo.getId();
if (!TextUtils.equals(sessionId, sessionInfo.getId())) {
@@ -551,6 +551,12 @@ public final class MediaRouter2Manager {
}
}
void notifySessionReleased(RoutingSessionInfo session) {
for (CallbackRecord record : mCallbackRecords) {
record.mExecutor.execute(() -> record.mCallback.onSessionReleased(session));
}
}
void notifyRequestFailed(int reason) {
for (CallbackRecord record : mCallbackRecords) {
record.mExecutor.execute(() -> record.mCallback.onRequestFailed(reason));
@@ -864,9 +870,16 @@ public final class MediaRouter2Manager {
/**
* Called when a session is changed.
* @param sessionInfo the updated session
* @param session the updated session
*/
public void onSessionUpdated(@NonNull RoutingSessionInfo sessionInfo) {}
public void onSessionUpdated(@NonNull RoutingSessionInfo session) {}
/**
* Called when a session is released.
* @param session the released session.
* @see #releaseSession(RoutingSessionInfo)
*/
public void onSessionReleased(@NonNull RoutingSessionInfo session) {}
/**
* Called when media is transferred.
@@ -946,15 +959,21 @@ public final class MediaRouter2Manager {
class Client extends IMediaRouter2Manager.Stub {
@Override
public void notifySessionCreated(int requestId, RoutingSessionInfo sessionInfo) {
public void notifySessionCreated(int requestId, RoutingSessionInfo session) {
mHandler.sendMessage(obtainMessage(MediaRouter2Manager::createSessionOnHandler,
MediaRouter2Manager.this, requestId, sessionInfo));
MediaRouter2Manager.this, requestId, session));
}
@Override
public void notifySessionUpdated(RoutingSessionInfo sessionInfo) {
mHandler.sendMessage(obtainMessage(MediaRouter2Manager::handleSessionsUpdated,
MediaRouter2Manager.this, sessionInfo));
public void notifySessionUpdated(RoutingSessionInfo session) {
mHandler.sendMessage(obtainMessage(MediaRouter2Manager::handleSessionsUpdatedOnHandler,
MediaRouter2Manager.this, session));
}
@Override
public void notifySessionReleased(RoutingSessionInfo session) {
mHandler.sendMessage(obtainMessage(MediaRouter2Manager::notifySessionReleased,
MediaRouter2Manager.this, session));
}
@Override