diff options
16 files changed, 238 insertions, 235 deletions
diff --git a/media/java/android/media/IMediaRoute2ProviderClient.aidl b/media/java/android/media/IMediaRoute2ProviderClient.aidl index bcb2336dbf78..e8abfdca89b7 100644 --- a/media/java/android/media/IMediaRoute2ProviderClient.aidl +++ b/media/java/android/media/IMediaRoute2ProviderClient.aidl @@ -18,7 +18,7 @@ package android.media; import android.media.MediaRoute2ProviderInfo; import android.media.MediaRoute2Info; -import android.media.RouteSessionInfo; +import android.media.RoutingSessionInfo; import android.os.Bundle; /** @@ -26,7 +26,7 @@ import android.os.Bundle; */ oneway interface IMediaRoute2ProviderClient { void updateState(in MediaRoute2ProviderInfo providerInfo, - in List<RouteSessionInfo> sessionInfos); - void notifySessionCreated(in @nullable RouteSessionInfo sessionInfo, long requestId); - void notifySessionInfoChanged(in RouteSessionInfo sessionInfo); + in List<RoutingSessionInfo> sessionInfos); + void notifySessionCreated(in @nullable RoutingSessionInfo sessionInfo, long requestId); + void notifySessionInfoChanged(in RoutingSessionInfo sessionInfo); } diff --git a/media/java/android/media/IMediaRouter2Client.aidl b/media/java/android/media/IMediaRouter2Client.aidl index f90c7c59cbeb..bc7ebea2e61f 100644 --- a/media/java/android/media/IMediaRouter2Client.aidl +++ b/media/java/android/media/IMediaRouter2Client.aidl @@ -17,7 +17,7 @@ package android.media; import android.media.MediaRoute2Info; -import android.media.RouteSessionInfo; +import android.media.RoutingSessionInfo; import android.os.Bundle; /** @@ -28,7 +28,7 @@ oneway interface IMediaRouter2Client { void notifyRoutesAdded(in List<MediaRoute2Info> routes); void notifyRoutesRemoved(in List<MediaRoute2Info> routes); void notifyRoutesChanged(in List<MediaRoute2Info> routes); - void notifySessionCreated(in @nullable RouteSessionInfo sessionInfo, int requestId); - void notifySessionInfoChanged(in RouteSessionInfo sessionInfo); - void notifySessionReleased(in RouteSessionInfo sessionInfo); + void notifySessionCreated(in @nullable RoutingSessionInfo sessionInfo, int requestId); + void notifySessionInfoChanged(in RoutingSessionInfo sessionInfo); + void notifySessionReleased(in RoutingSessionInfo sessionInfo); } diff --git a/media/java/android/media/IMediaRouterService.aidl b/media/java/android/media/IMediaRouterService.aidl index 06abdc18ab41..3cdaa0794b31 100644 --- a/media/java/android/media/IMediaRouterService.aidl +++ b/media/java/android/media/IMediaRouterService.aidl @@ -23,7 +23,7 @@ import android.media.IMediaRouterClient; import android.media.MediaRoute2Info; import android.media.MediaRouterClientState; import android.media.RouteDiscoveryPreference; -import android.media.RouteSessionInfo; +import android.media.RoutingSessionInfo; /** * {@hide} @@ -70,5 +70,5 @@ interface IMediaRouterService { void requestUpdateVolume2Manager(IMediaRouter2Manager manager, in MediaRoute2Info route, int direction); - List<RouteSessionInfo> getActiveSessions(IMediaRouter2Manager manager); + List<RoutingSessionInfo> getActiveSessions(IMediaRouter2Manager manager); } diff --git a/media/java/android/media/MediaRoute2ProviderService.java b/media/java/android/media/MediaRoute2ProviderService.java index 8333b0f96c17..1cd5dfa087fa 100644 --- a/media/java/android/media/MediaRoute2ProviderService.java +++ b/media/java/android/media/MediaRoute2ProviderService.java @@ -66,7 +66,7 @@ public abstract class MediaRoute2ProviderService extends Service { private MediaRoute2ProviderInfo mProviderInfo; @GuardedBy("mSessionLock") - private ArrayMap<String, RouteSessionInfo> mSessionInfo = new ArrayMap<>(); + private ArrayMap<String, RoutingSessionInfo> mSessionInfo = new ArrayMap<>(); public MediaRoute2ProviderService() { mHandler = new Handler(Looper.getMainLooper()); @@ -122,7 +122,7 @@ public abstract class MediaRoute2ProviderService extends Service { * @hide */ @Nullable - public final RouteSessionInfo getSessionInfo(@NonNull String sessionId) { + public final RoutingSessionInfo getSessionInfo(@NonNull String sessionId) { if (TextUtils.isEmpty(sessionId)) { throw new IllegalArgumentException("sessionId must not be empty"); } @@ -132,11 +132,11 @@ public abstract class MediaRoute2ProviderService extends Service { } /** - * Gets the list of {@link RouteSessionInfo session info} that the provider service maintains. + * Gets the list of {@link RoutingSessionInfo session info} that the provider service maintains. * @hide */ @NonNull - public final List<RouteSessionInfo> getAllSessionInfo() { + public final List<RoutingSessionInfo> getAllSessionInfo() { synchronized (mSessionLock) { return new ArrayList<>(mSessionInfo.values()); } @@ -149,10 +149,10 @@ public abstract class MediaRoute2ProviderService extends Service { * session info changes. * * @param sessionInfo new session information - * @see #notifySessionCreated(RouteSessionInfo, long) + * @see #notifySessionCreated(RoutingSessionInfo, long) * @hide */ - public final void updateSessionInfo(@NonNull RouteSessionInfo sessionInfo) { + public final void updateSessionInfo(@NonNull RoutingSessionInfo sessionInfo) { Objects.requireNonNull(sessionInfo, "sessionInfo must not be null"); String sessionId = sessionInfo.getId(); @@ -173,7 +173,7 @@ public abstract class MediaRoute2ProviderService extends Service { * TODO: This method is temporary, only created for tests. Remove when the alternative is ready. * @hide */ - public final void notifySessionInfoChanged(@NonNull RouteSessionInfo sessionInfo) { + public final void notifySessionInfoChanged(@NonNull RoutingSessionInfo sessionInfo) { Objects.requireNonNull(sessionInfo, "sessionInfo must not be null"); String sessionId = sessionInfo.getId(); @@ -201,7 +201,7 @@ public abstract class MediaRoute2ProviderService extends Service { * controlled, pass a {@link Bundle} that contains how to control it. * * @param sessionInfo information of the new session. - * The {@link RouteSessionInfo#getId() id} of the session must be + * The {@link RoutingSessionInfo#getId() id} of the session must be * unique. Pass {@code null} to reject the request or inform clients that * session creation is failed. * @param requestId id of the previous request to create this session @@ -209,7 +209,8 @@ public abstract class MediaRoute2ProviderService extends Service { */ // TODO: fail reason? // TODO: Maybe better to create notifySessionCreationFailed? - public final void notifySessionCreated(@Nullable RouteSessionInfo sessionInfo, long requestId) { + public final void notifySessionCreated(@Nullable RoutingSessionInfo sessionInfo, + long requestId) { if (sessionInfo != null) { String sessionId = sessionInfo.getId(); synchronized (mSessionLock) { @@ -237,7 +238,7 @@ public abstract class MediaRoute2ProviderService extends Service { * {@link #onDestroySession} is called if the session is released. * * @param sessionId id of the session to be released - * @see #onDestroySession(String, RouteSessionInfo) + * @see #onDestroySession(String, RoutingSessionInfo) * @hide */ public final void releaseSession(@NonNull String sessionId) { @@ -245,7 +246,7 @@ public abstract class MediaRoute2ProviderService extends Service { throw new IllegalArgumentException("sessionId must not be empty"); } //TODO: notify media router service of release. - RouteSessionInfo sessionInfo; + RoutingSessionInfo sessionInfo; synchronized (mSessionLock) { sessionInfo = mSessionInfo.remove(sessionId); } @@ -259,10 +260,10 @@ public abstract class MediaRoute2ProviderService extends Service { /** * Called when a session should be created. * You should create and maintain your own session and notifies the client of - * session info. Call {@link #notifySessionCreated(RouteSessionInfo, long)} + * session info. Call {@link #notifySessionCreated(RoutingSessionInfo, long)} * with the given {@code requestId} to notify the information of a new session. * If you can't create the session or want to reject the request, pass {@code null} - * as session info in {@link #notifySessionCreated(RouteSessionInfo, long)} + * as session info in {@link #notifySessionCreated(RoutingSessionInfo, long)} * with the given {@code requestId}. * * @param packageName the package name of the application that selected the route @@ -285,18 +286,18 @@ public abstract class MediaRoute2ProviderService extends Service { * @hide */ public abstract void onDestroySession(@NonNull String sessionId, - @NonNull RouteSessionInfo lastSessionInfo); + @NonNull RoutingSessionInfo lastSessionInfo); //TODO: make a way to reject the request /** * Called when a client requests selecting a route for the session. - * After the route is selected, call {@link #updateSessionInfo(RouteSessionInfo)} to update + * After the route is selected, call {@link #updateSessionInfo(RoutingSessionInfo)} to update * session info and call {@link #updateProviderInfo(MediaRoute2ProviderInfo)} to notify * clients of updated session info. * * @param sessionId id of the session * @param routeId id of the route - * @see #updateSessionInfo(RouteSessionInfo) + * @see #updateSessionInfo(RoutingSessionInfo) * @hide */ public abstract void onSelectRoute(@NonNull String sessionId, @NonNull String routeId); @@ -304,7 +305,7 @@ public abstract class MediaRoute2ProviderService extends Service { //TODO: make a way to reject the request /** * Called when a client requests deselecting a route from the session. - * After the route is deselected, call {@link #updateSessionInfo(RouteSessionInfo)} to update + * After the route is deselected, call {@link #updateSessionInfo(RoutingSessionInfo)} to update * session info and call {@link #updateProviderInfo(MediaRoute2ProviderInfo)} to notify * clients of updated session info. * @@ -317,7 +318,7 @@ public abstract class MediaRoute2ProviderService extends Service { //TODO: make a way to reject the request /** * Called when a client requests transferring a session to a route. - * After the transfer is finished, call {@link #updateSessionInfo(RouteSessionInfo)} to update + * After the transfer is finished, call {@link #updateSessionInfo(RoutingSessionInfo)} to update * session info and call {@link #updateProviderInfo(MediaRoute2ProviderInfo)} to notify * clients of updated session info. * @@ -377,7 +378,7 @@ public abstract class MediaRoute2ProviderService extends Service { return; } - List<RouteSessionInfo> sessionInfos; + List<RoutingSessionInfo> sessionInfos; synchronized (mSessionLock) { sessionInfos = new ArrayList<>(mSessionInfo.values()); } diff --git a/media/java/android/media/MediaRouter2.java b/media/java/android/media/MediaRouter2.java index a89dece79925..6d37c2df63ec 100644 --- a/media/java/android/media/MediaRouter2.java +++ b/media/java/android/media/MediaRouter2.java @@ -84,7 +84,7 @@ public class MediaRouter2 { Client2 mClient; @GuardedBy("sLock") - private Map<String, RouteSessionController> mSessionControllers = new ArrayMap<>(); + private Map<String, RoutingController> mRoutingControllers = new ArrayMap<>(); private AtomicInteger mSessionCreationRequestCnt = new AtomicInteger(1); @@ -241,7 +241,7 @@ public class MediaRouter2 { } /** - * Registers a callback to get updates on creations and changes of route sessions. + * Registers a callback to get updates on creations and changes of routing sessions. * If you register the same callback twice or more, it will be ignored. * * @param executor the executor to execute the callback on @@ -455,7 +455,7 @@ public class MediaRouter2 { * <p> * Pass {@code null} to sessionInfo for the failure case. */ - void createControllerOnHandler(@Nullable RouteSessionInfo sessionInfo, int requestId) { + void createControllerOnHandler(@Nullable RoutingSessionInfo sessionInfo, int requestId) { SessionCreationRequest matchingRequest = null; for (SessionCreationRequest request : mSessionCreationRequests) { if (request.mRequestId == requestId) { @@ -502,23 +502,23 @@ public class MediaRouter2 { } if (sessionInfo != null) { - RouteSessionController controller = new RouteSessionController(sessionInfo); + RoutingController controller = new RoutingController(sessionInfo); synchronized (sRouterLock) { - mSessionControllers.put(controller.getSessionId(), controller); + mRoutingControllers.put(controller.getSessionId(), controller); } notifySessionCreated(controller); } } - void changeSessionInfoOnHandler(RouteSessionInfo sessionInfo) { + void changeSessionInfoOnHandler(RoutingSessionInfo sessionInfo) { if (sessionInfo == null) { Log.w(TAG, "changeSessionInfoOnHandler: Ignoring null sessionInfo."); return; } - RouteSessionController matchingController; + RoutingController matchingController; synchronized (sRouterLock) { - matchingController = mSessionControllers.get(sessionInfo.getId()); + matchingController = mRoutingControllers.get(sessionInfo.getId()); } if (matchingController == null) { @@ -527,27 +527,27 @@ public class MediaRouter2 { return; } - RouteSessionInfo oldInfo = matchingController.getRouteSessionInfo(); + RoutingSessionInfo oldInfo = matchingController.getRoutingSessionInfo(); if (!TextUtils.equals(oldInfo.getProviderId(), sessionInfo.getProviderId())) { Log.w(TAG, "changeSessionInfoOnHandler: Provider IDs are not matched. old=" + oldInfo.getProviderId() + ", new=" + sessionInfo.getProviderId()); return; } - matchingController.setRouteSessionInfo(sessionInfo); + matchingController.setRoutingSessionInfo(sessionInfo); notifySessionInfoChanged(matchingController, oldInfo, sessionInfo); } - void releaseControllerOnHandler(RouteSessionInfo sessionInfo) { + void releaseControllerOnHandler(RoutingSessionInfo sessionInfo) { if (sessionInfo == null) { Log.w(TAG, "releaseControllerOnHandler: Ignoring null sessionInfo."); return; } final String uniqueSessionId = sessionInfo.getId(); - RouteSessionController matchingController; + RoutingController matchingController; synchronized (sRouterLock) { - matchingController = mSessionControllers.get(uniqueSessionId); + matchingController = mRoutingControllers.get(uniqueSessionId); } if (matchingController == null) { @@ -558,7 +558,7 @@ public class MediaRouter2 { return; } - RouteSessionInfo oldInfo = matchingController.getRouteSessionInfo(); + RoutingSessionInfo oldInfo = matchingController.getRoutingSessionInfo(); if (!TextUtils.equals(oldInfo.getProviderId(), sessionInfo.getProviderId())) { Log.w(TAG, "releaseControllerOnHandler: Provider IDs are not matched. old=" + oldInfo.getProviderId() + ", new=" + sessionInfo.getProviderId()); @@ -566,7 +566,7 @@ public class MediaRouter2 { } synchronized (sRouterLock) { - mSessionControllers.remove(uniqueSessionId, matchingController); + mRoutingControllers.remove(uniqueSessionId, matchingController); } matchingController.release(); notifyControllerReleased(matchingController); @@ -610,7 +610,7 @@ public class MediaRouter2 { } } - private void notifySessionCreated(RouteSessionController controller) { + private void notifySessionCreated(RoutingController controller) { for (SessionCallbackRecord record: mSessionCallbackRecords) { record.mExecutor.execute( () -> record.mSessionCallback.onSessionCreated(controller)); @@ -624,8 +624,8 @@ public class MediaRouter2 { } } - private void notifySessionInfoChanged(RouteSessionController controller, - RouteSessionInfo oldInfo, RouteSessionInfo newInfo) { + private void notifySessionInfoChanged(RoutingController controller, + RoutingSessionInfo oldInfo, RoutingSessionInfo newInfo) { for (SessionCallbackRecord record: mSessionCallbackRecords) { record.mExecutor.execute( () -> record.mSessionCallback.onSessionInfoChanged( @@ -633,7 +633,7 @@ public class MediaRouter2 { } } - private void notifyControllerReleased(RouteSessionController controller) { + private void notifyControllerReleased(RoutingController controller) { for (SessionCallbackRecord record: mSessionCallbackRecords) { record.mExecutor.execute( () -> record.mSessionCallback.onSessionReleased(controller)); @@ -678,11 +678,11 @@ public class MediaRouter2 { */ public static class SessionCallback { /** - * Called when the route session is created by the route provider. + * Called when the routing session is created by the route provider. * * @param controller the controller to control the created session */ - public void onSessionCreated(@NonNull RouteSessionController controller) {} + public void onSessionCreated(@NonNull RoutingController controller) {} /** * Called when the session creation request failed. @@ -702,45 +702,45 @@ public class MediaRouter2 { * TODO: (Discussion) Do we really need newInfo? The controller has the newInfo. * However. there can be timing issue if there is no newInfo. */ - public void onSessionInfoChanged(@NonNull RouteSessionController controller, - @NonNull RouteSessionInfo oldInfo, - @NonNull RouteSessionInfo newInfo) {} + public void onSessionInfoChanged(@NonNull RoutingController controller, + @NonNull RoutingSessionInfo oldInfo, + @NonNull RoutingSessionInfo newInfo) {} /** * Called when the session is released by {@link MediaRoute2ProviderService}. * Before this method is called, the controller would be released by the system, - * which means the {@link RouteSessionController#isReleased()} will always return true + * which means the {@link RoutingController#isReleased()} will always return true * for the {@code controller} here. * <p> - * Note: Calling {@link RouteSessionController#release()} will <em>NOT</em> trigger + * Note: Calling {@link RoutingController#release()} will <em>NOT</em> trigger * this method to be called. * * TODO: Add tests for checking whether this method is called. * TODO: When service process dies, this should be called. * - * @see RouteSessionController#isReleased() + * @see RoutingController#isReleased() */ - public void onSessionReleased(@NonNull RouteSessionController controller) {} + public void onSessionReleased(@NonNull RoutingController controller) {} } /** - * A class to control media route session in media route provider. + * A class to control media routing session in media route provider. * For example, selecting/deselcting/transferring routes to session can be done through this * class. Instances are created by {@link MediaRouter2}. * * TODO: Need to add toString() * @hide */ - public final class RouteSessionController { + public final class RoutingController { private final Object mControllerLock = new Object(); @GuardedBy("mLock") - private RouteSessionInfo mSessionInfo; + private RoutingSessionInfo mSessionInfo; @GuardedBy("mLock") private volatile boolean mIsReleased; - RouteSessionController(@NonNull RouteSessionInfo sessionInfo) { + RoutingController(@NonNull RoutingSessionInfo sessionInfo) { mSessionInfo = sessionInfo; } @@ -764,7 +764,7 @@ public class MediaRouter2 { } /** - * @return the control hints used to control route session if available. + * @return the control hints used to control routing session if available. */ @Nullable public Bundle getControlHints() { @@ -986,7 +986,7 @@ public class MediaRouter2 { Client2 client; synchronized (sRouterLock) { - mSessionControllers.remove(getSessionId(), this); + mRoutingControllers.remove(getSessionId(), this); client = mClient; } if (client != null) { @@ -1003,13 +1003,13 @@ public class MediaRouter2 { * @hide */ @NonNull - public RouteSessionInfo getRouteSessionInfo() { + public RoutingSessionInfo getRoutingSessionInfo() { synchronized (mControllerLock) { return mSessionInfo; } } - void setRouteSessionInfo(@NonNull RouteSessionInfo info) { + void setRoutingSessionInfo(@NonNull RoutingSessionInfo info) { synchronized (mControllerLock) { mSessionInfo = info; } @@ -1125,19 +1125,19 @@ public class MediaRouter2 { } @Override - public void notifySessionCreated(@Nullable RouteSessionInfo sessionInfo, int requestId) { + public void notifySessionCreated(@Nullable RoutingSessionInfo sessionInfo, int requestId) { mHandler.sendMessage(obtainMessage(MediaRouter2::createControllerOnHandler, MediaRouter2.this, sessionInfo, requestId)); } @Override - public void notifySessionInfoChanged(@Nullable RouteSessionInfo sessionInfo) { + public void notifySessionInfoChanged(@Nullable RoutingSessionInfo sessionInfo) { mHandler.sendMessage(obtainMessage(MediaRouter2::changeSessionInfoOnHandler, MediaRouter2.this, sessionInfo)); } @Override - public void notifySessionReleased(RouteSessionInfo sessionInfo) { + public void notifySessionReleased(RoutingSessionInfo sessionInfo) { mHandler.sendMessage(obtainMessage(MediaRouter2::releaseControllerOnHandler, MediaRouter2.this, sessionInfo)); } diff --git a/media/java/android/media/MediaRouter2Manager.java b/media/java/android/media/MediaRouter2Manager.java index f445cdb465fa..70229335905b 100644 --- a/media/java/android/media/MediaRouter2Manager.java +++ b/media/java/android/media/MediaRouter2Manager.java @@ -176,7 +176,7 @@ public class MediaRouter2Manager { } @NonNull - public List<RouteSessionInfo> getActiveSessions() { + public List<RoutingSessionInfo> getActiveSessions() { Client client; synchronized (sLock) { client = mClient; diff --git a/media/java/android/media/RouteSessionInfo.aidl b/media/java/android/media/RoutingSessionInfo.aidl index fb5d836da98e..7b8e3d912cc1 100644 --- a/media/java/android/media/RouteSessionInfo.aidl +++ b/media/java/android/media/RoutingSessionInfo.aidl @@ -16,4 +16,4 @@ package android.media; -parcelable RouteSessionInfo; +parcelable RoutingSessionInfo; diff --git a/media/java/android/media/RouteSessionInfo.java b/media/java/android/media/RoutingSessionInfo.java index def5197874a5..96acf6cec5b4 100644 --- a/media/java/android/media/RouteSessionInfo.java +++ b/media/java/android/media/RoutingSessionInfo.java @@ -30,24 +30,24 @@ import java.util.List; import java.util.Objects; /** - * Describes a route session that is made when a media route is selected. + * Describes a routing session which is created when a media route is selected. * @hide */ -public final class RouteSessionInfo implements Parcelable { +public final class RoutingSessionInfo implements Parcelable { @NonNull - public static final Creator<RouteSessionInfo> CREATOR = - new Creator<RouteSessionInfo>() { + public static final Creator<RoutingSessionInfo> CREATOR = + new Creator<RoutingSessionInfo>() { @Override - public RouteSessionInfo createFromParcel(Parcel in) { - return new RouteSessionInfo(in); + public RoutingSessionInfo createFromParcel(Parcel in) { + return new RoutingSessionInfo(in); } @Override - public RouteSessionInfo[] newArray(int size) { - return new RouteSessionInfo[size]; + public RoutingSessionInfo[] newArray(int size) { + return new RoutingSessionInfo[size]; } }; - public static final String TAG = "RouteSessionInfo"; + private static final String TAG = "RoutingSessionInfo"; final String mId; final String mClientPackageName; @@ -61,7 +61,7 @@ public final class RouteSessionInfo implements Parcelable { @Nullable final Bundle mControlHints; - RouteSessionInfo(@NonNull Builder builder) { + RoutingSessionInfo(@NonNull Builder builder) { Objects.requireNonNull(builder, "builder must not be null."); mId = builder.mId; @@ -82,7 +82,7 @@ public final class RouteSessionInfo implements Parcelable { mControlHints = builder.mControlHints; } - RouteSessionInfo(@NonNull Parcel src) { + RoutingSessionInfo(@NonNull Parcel src) { Objects.requireNonNull(src, "src must not be null."); mId = ensureString(src.readString()); @@ -228,11 +228,11 @@ public final class RouteSessionInfo implements Parcelable { if (this == obj) { return true; } - if (!(obj instanceof RouteSessionInfo)) { + if (!(obj instanceof RoutingSessionInfo)) { return false; } - RouteSessionInfo other = (RouteSessionInfo) obj; + RoutingSessionInfo other = (RoutingSessionInfo) obj; return Objects.equals(mId, other.mId) && Objects.equals(mClientPackageName, other.mClientPackageName) && Objects.equals(mRouteFeature, other.mRouteFeature) @@ -252,7 +252,7 @@ public final class RouteSessionInfo implements Parcelable { @Override public String toString() { StringBuilder result = new StringBuilder() - .append("RouteSessionInfo{ ") + .append("RoutingSessionInfo{ ") .append("sessionId=").append(mId) .append(", routeFeature=").append(mRouteFeature) .append(", selectedRoutes={") @@ -290,7 +290,7 @@ public final class RouteSessionInfo implements Parcelable { } /** - * Builder class for {@link RouteSessionInfo}. + * Builder class for {@link RoutingSessionInfo}. */ public static final class Builder { final String mId; @@ -304,10 +304,10 @@ public final class RouteSessionInfo implements Parcelable { Bundle mControlHints; /** - * Constructor for builder to create {@link RouteSessionInfo}. + * Constructor for builder to create {@link RoutingSessionInfo}. * <p> * In order to ensure ID uniqueness in {@link MediaRouter2} side, the value of - * {@link RouteSessionInfo#getId()} can be different from what was set in + * {@link RoutingSessionInfo#getId()} can be different from what was set in * {@link MediaRoute2ProviderService}. * </p> * @@ -337,12 +337,12 @@ public final class RouteSessionInfo implements Parcelable { } /** - * Constructor for builder to create {@link RouteSessionInfo} with - * existing {@link RouteSessionInfo} instance. + * Constructor for builder to create {@link RoutingSessionInfo} with + * existing {@link RoutingSessionInfo} instance. * * @param sessionInfo the existing instance to copy data from. */ - public Builder(@NonNull RouteSessionInfo sessionInfo) { + public Builder(@NonNull RoutingSessionInfo sessionInfo) { Objects.requireNonNull(sessionInfo, "sessionInfo must not be null"); mId = sessionInfo.mId; @@ -514,16 +514,16 @@ public final class RouteSessionInfo implements Parcelable { } /** - * Builds a route session info. + * Builds a routing session info. * * @throws IllegalArgumentException if no selected routes are added. */ @NonNull - public RouteSessionInfo build() { + public RoutingSessionInfo build() { if (mSelectedRoutes.isEmpty()) { throw new IllegalArgumentException("selectedRoutes must not be empty"); } - return new RouteSessionInfo(this); + return new RoutingSessionInfo(this); } } } diff --git a/media/tests/MediaRouteProvider/src/com/android/mediarouteprovider/example/SampleMediaRoute2ProviderService.java b/media/tests/MediaRouteProvider/src/com/android/mediarouteprovider/example/SampleMediaRoute2ProviderService.java index b81c378ad2ba..221783b1c97d 100644 --- a/media/tests/MediaRouteProvider/src/com/android/mediarouteprovider/example/SampleMediaRoute2ProviderService.java +++ b/media/tests/MediaRouteProvider/src/com/android/mediarouteprovider/example/SampleMediaRoute2ProviderService.java @@ -22,7 +22,7 @@ import static android.media.MediaRoute2Info.DEVICE_TYPE_REMOTE_TV; import android.content.Intent; import android.media.MediaRoute2Info; import android.media.MediaRoute2ProviderService; -import android.media.RouteSessionInfo; +import android.media.RoutingSessionInfo; import android.os.IBinder; import android.text.TextUtils; @@ -63,7 +63,7 @@ public class SampleMediaRoute2ProviderService extends MediaRoute2ProviderService "com.android.mediarouteprovider.FEATURE_SPECIAL"; Map<String, MediaRoute2Info> mRoutes = new HashMap<>(); - Map<String, String> mRouteSessionMap = new HashMap<>(); + Map<String, String> mRouteIdToSessionId = new HashMap<>(); private int mNextSessionId = 1000; private void initializeRoutes() { @@ -183,9 +183,9 @@ public class SampleMediaRoute2ProviderService extends MediaRoute2ProviderService mRoutes.put(routeId, new MediaRoute2Info.Builder(route) .setClientPackageName(packageName) .build()); - mRouteSessionMap.put(routeId, sessionId); + mRouteIdToSessionId.put(routeId, sessionId); - RouteSessionInfo sessionInfo = new RouteSessionInfo.Builder( + RoutingSessionInfo sessionInfo = new RoutingSessionInfo.Builder( sessionId, packageName, routeFeature) .addSelectedRoute(routeId) .addSelectableRoute(ROUTE_ID4_TO_SELECT_AND_DESELECT) @@ -196,9 +196,9 @@ public class SampleMediaRoute2ProviderService extends MediaRoute2ProviderService } @Override - public void onDestroySession(String sessionId, RouteSessionInfo lastSessionInfo) { + public void onDestroySession(String sessionId, RoutingSessionInfo lastSessionInfo) { for (String routeId : lastSessionInfo.getSelectedRoutes()) { - mRouteSessionMap.remove(routeId); + mRouteIdToSessionId.remove(routeId); MediaRoute2Info route = mRoutes.get(routeId); if (route != null) { mRoutes.put(routeId, new MediaRoute2Info.Builder(route) @@ -210,7 +210,7 @@ public class SampleMediaRoute2ProviderService extends MediaRoute2ProviderService @Override public void onSelectRoute(String sessionId, String routeId) { - RouteSessionInfo sessionInfo = getSessionInfo(sessionId); + RoutingSessionInfo sessionInfo = getSessionInfo(sessionId); MediaRoute2Info route = mRoutes.get(routeId); if (route == null || sessionInfo == null) { return; @@ -220,9 +220,9 @@ public class SampleMediaRoute2ProviderService extends MediaRoute2ProviderService mRoutes.put(routeId, new MediaRoute2Info.Builder(route) .setClientPackageName(sessionInfo.getClientPackageName()) .build()); - mRouteSessionMap.put(routeId, sessionId); + mRouteIdToSessionId.put(routeId, sessionId); - RouteSessionInfo newSessionInfo = new RouteSessionInfo.Builder(sessionInfo) + RoutingSessionInfo newSessionInfo = new RoutingSessionInfo.Builder(sessionInfo) .addSelectedRoute(routeId) .removeSelectableRoute(routeId) .addDeselectableRoute(routeId) @@ -233,15 +233,15 @@ public class SampleMediaRoute2ProviderService extends MediaRoute2ProviderService @Override public void onDeselectRoute(String sessionId, String routeId) { - RouteSessionInfo sessionInfo = getSessionInfo(sessionId); + RoutingSessionInfo sessionInfo = getSessionInfo(sessionId); MediaRoute2Info route = mRoutes.get(routeId); - mRouteSessionMap.remove(routeId); if (sessionInfo == null || route == null || !sessionInfo.getSelectedRoutes().contains(routeId)) { return; } + mRouteIdToSessionId.remove(routeId); mRoutes.put(routeId, new MediaRoute2Info.Builder(route) .setClientPackageName(null) .build()); @@ -251,7 +251,7 @@ public class SampleMediaRoute2ProviderService extends MediaRoute2ProviderService return; } - RouteSessionInfo newSessionInfo = new RouteSessionInfo.Builder(sessionInfo) + RoutingSessionInfo newSessionInfo = new RoutingSessionInfo.Builder(sessionInfo) .removeSelectedRoute(routeId) .addSelectableRoute(routeId) .removeDeselectableRoute(routeId) @@ -262,8 +262,8 @@ public class SampleMediaRoute2ProviderService extends MediaRoute2ProviderService @Override public void onTransferToRoute(String sessionId, String routeId) { - RouteSessionInfo sessionInfo = getSessionInfo(sessionId); - RouteSessionInfo newSessionInfo = new RouteSessionInfo.Builder(sessionInfo) + RoutingSessionInfo sessionInfo = getSessionInfo(sessionId); + RoutingSessionInfo newSessionInfo = new RoutingSessionInfo.Builder(sessionInfo) .clearSelectedRoutes() .addSelectedRoute(routeId) .removeDeselectableRoute(routeId) @@ -274,11 +274,11 @@ public class SampleMediaRoute2ProviderService extends MediaRoute2ProviderService } void maybeDeselectRoute(String routeId) { - if (!mRouteSessionMap.containsKey(routeId)) { + if (!mRouteIdToSessionId.containsKey(routeId)) { return; } - String sessionId = mRouteSessionMap.get(routeId); + String sessionId = mRouteIdToSessionId.get(routeId); onDeselectRoute(sessionId, routeId); } diff --git a/media/tests/MediaRouter/src/com/android/mediaroutertest/MediaRouter2Test.java b/media/tests/MediaRouter/src/com/android/mediaroutertest/MediaRouter2Test.java index 908d7bf92c35..007229a4df2b 100644 --- a/media/tests/MediaRouter/src/com/android/mediaroutertest/MediaRouter2Test.java +++ b/media/tests/MediaRouter/src/com/android/mediaroutertest/MediaRouter2Test.java @@ -48,10 +48,10 @@ import android.content.Context; import android.media.MediaRoute2Info; import android.media.MediaRouter2; import android.media.MediaRouter2.RouteCallback; -import android.media.MediaRouter2.RouteSessionController; +import android.media.MediaRouter2.RoutingController; import android.media.MediaRouter2.SessionCallback; import android.media.RouteDiscoveryPreference; -import android.media.RouteSessionInfo; +import android.media.RoutingSessionInfo; import android.net.Uri; import android.os.Parcel; import android.support.test.InstrumentationRegistry; @@ -253,12 +253,12 @@ public class MediaRouter2Test { final CountDownLatch successLatch = new CountDownLatch(1); final CountDownLatch failureLatch = new CountDownLatch(1); - final List<RouteSessionController> controllers = new ArrayList<>(); + final List<RoutingController> controllers = new ArrayList<>(); // Create session with this route SessionCallback sessionCallback = new SessionCallback() { @Override - public void onSessionCreated(RouteSessionController controller) { + public void onSessionCreated(RoutingController controller) { assertNotNull(controller); assertTrue(createRouteMap(controller.getSelectedRoutes()).containsKey(ROUTE_ID1)); assertTrue(TextUtils.equals(FEATURE_SAMPLE, controller.getRouteFeature())); @@ -302,12 +302,12 @@ public class MediaRouter2Test { final CountDownLatch successLatch = new CountDownLatch(1); final CountDownLatch failureLatch = new CountDownLatch(1); - final List<RouteSessionController> controllers = new ArrayList<>(); + final List<RoutingController> controllers = new ArrayList<>(); // Create session with this route SessionCallback sessionCallback = new SessionCallback() { @Override - public void onSessionCreated(RouteSessionController controller) { + public void onSessionCreated(RoutingController controller) { controllers.add(controller); successLatch.countDown(); } @@ -346,12 +346,12 @@ public class MediaRouter2Test { final CountDownLatch successLatch = new CountDownLatch(2); final CountDownLatch failureLatch = new CountDownLatch(1); - final List<RouteSessionController> createdControllers = new ArrayList<>(); + final List<RoutingController> createdControllers = new ArrayList<>(); // Create session with this route SessionCallback sessionCallback = new SessionCallback() { @Override - public void onSessionCreated(RouteSessionController controller) { + public void onSessionCreated(RoutingController controller) { createdControllers.add(controller); successLatch.countDown(); } @@ -384,8 +384,8 @@ public class MediaRouter2Test { // Created controllers should have proper info assertEquals(2, createdControllers.size()); - RouteSessionController controller1 = createdControllers.get(0); - RouteSessionController controller2 = createdControllers.get(1); + RoutingController controller1 = createdControllers.get(0); + RoutingController controller2 = createdControllers.get(1); assertNotEquals(controller1.getSessionId(), controller2.getSessionId()); assertTrue(createRouteMap(controller1.getSelectedRoutes()).containsKey(ROUTE_ID1)); @@ -411,12 +411,12 @@ public class MediaRouter2Test { final CountDownLatch successLatch = new CountDownLatch(1); final CountDownLatch failureLatch = new CountDownLatch(1); - final List<RouteSessionController> controllers = new ArrayList<>(); + final List<RoutingController> controllers = new ArrayList<>(); // Create session with this route SessionCallback sessionCallback = new SessionCallback() { @Override - public void onSessionCreated(RouteSessionController controller) { + public void onSessionCreated(RoutingController controller) { controllers.add(controller); successLatch.countDown(); } @@ -451,7 +451,7 @@ public class MediaRouter2Test { // TODO: Add tests for illegal inputs if needed (e.g. selecting already selected route) @Test - public void testRouteSessionControllerSelectAndDeselectRoute() throws Exception { + public void testRoutingControllerSelectAndDeselectRoute() throws Exception { final List<String> sampleRouteType = new ArrayList<>(); sampleRouteType.add(FEATURE_SAMPLE); @@ -462,12 +462,12 @@ public class MediaRouter2Test { final CountDownLatch onSessionCreatedLatch = new CountDownLatch(1); final CountDownLatch onSessionInfoChangedLatchForSelect = new CountDownLatch(1); final CountDownLatch onSessionInfoChangedLatchForDeselect = new CountDownLatch(1); - final List<RouteSessionController> controllers = new ArrayList<>(); + final List<RoutingController> controllers = new ArrayList<>(); // Create session with ROUTE_ID1 SessionCallback sessionCallback = new SessionCallback() { @Override - public void onSessionCreated(RouteSessionController controller) { + public void onSessionCreated(RoutingController controller) { assertNotNull(controller); assertTrue(getRouteIds(controller.getSelectedRoutes()).contains(ROUTE_ID1)); assertTrue(TextUtils.equals(FEATURE_SAMPLE, controller.getRouteFeature())); @@ -476,8 +476,8 @@ public class MediaRouter2Test { } @Override - public void onSessionInfoChanged(RouteSessionController controller, - RouteSessionInfo oldInfo, RouteSessionInfo newInfo) { + public void onSessionInfoChanged(RoutingController controller, + RoutingSessionInfo oldInfo, RoutingSessionInfo newInfo) { if (onSessionCreatedLatch.getCount() != 0 || !TextUtils.equals( controllers.get(0).getSessionId(), controller.getSessionId())) { @@ -527,7 +527,7 @@ public class MediaRouter2Test { assertTrue(onSessionCreatedLatch.await(TIMEOUT_MS, TimeUnit.MILLISECONDS)); assertEquals(1, controllers.size()); - RouteSessionController controller = controllers.get(0); + RoutingController controller = controllers.get(0); assertTrue(getRouteIds(controller.getSelectableRoutes()) .contains(ROUTE_ID4_TO_SELECT_AND_DESELECT)); @@ -550,7 +550,7 @@ public class MediaRouter2Test { } @Test - public void testRouteSessionControllerTransferToRoute() throws Exception { + public void testRoutingControllerTransferToRoute() throws Exception { final List<String> sampleRouteType = new ArrayList<>(); sampleRouteType.add(FEATURE_SAMPLE); @@ -560,12 +560,12 @@ public class MediaRouter2Test { final CountDownLatch onSessionCreatedLatch = new CountDownLatch(1); final CountDownLatch onSessionInfoChangedLatch = new CountDownLatch(1); - final List<RouteSessionController> controllers = new ArrayList<>(); + final List<RoutingController> controllers = new ArrayList<>(); // Create session with ROUTE_ID1 SessionCallback sessionCallback = new SessionCallback() { @Override - public void onSessionCreated(RouteSessionController controller) { + public void onSessionCreated(RoutingController controller) { assertNotNull(controller); assertTrue(getRouteIds(controller.getSelectedRoutes()).contains(ROUTE_ID1)); assertTrue(TextUtils.equals(FEATURE_SAMPLE, controller.getRouteFeature())); @@ -574,8 +574,8 @@ public class MediaRouter2Test { } @Override - public void onSessionInfoChanged(RouteSessionController controller, - RouteSessionInfo oldInfo, RouteSessionInfo newInfo) { + public void onSessionInfoChanged(RoutingController controller, + RoutingSessionInfo oldInfo, RoutingSessionInfo newInfo) { if (onSessionCreatedLatch.getCount() != 0 || !TextUtils.equals( controllers.get(0).getSessionId(), controller.getSessionId())) { @@ -609,7 +609,7 @@ public class MediaRouter2Test { assertTrue(onSessionCreatedLatch.await(TIMEOUT_MS, TimeUnit.MILLISECONDS)); assertEquals(1, controllers.size()); - RouteSessionController controller = controllers.get(0); + RoutingController controller = controllers.get(0); assertTrue(getRouteIds(controller.getTransferrableRoutes()) .contains(ROUTE_ID5_TO_TRANSFER_TO)); @@ -629,7 +629,7 @@ public class MediaRouter2Test { // TODO: Add tests for onSessionReleased() call. @Test - public void testRouteSessionControllerReleaseShouldIgnoreTransferTo() throws Exception { + public void testRoutingControllerReleaseShouldIgnoreTransferTo() throws Exception { final List<String> sampleRouteType = new ArrayList<>(); sampleRouteType.add(FEATURE_SAMPLE); @@ -639,12 +639,12 @@ public class MediaRouter2Test { final CountDownLatch onSessionCreatedLatch = new CountDownLatch(1); final CountDownLatch onSessionInfoChangedLatch = new CountDownLatch(1); - final List<RouteSessionController> controllers = new ArrayList<>(); + final List<RoutingController> controllers = new ArrayList<>(); // Create session with ROUTE_ID1 SessionCallback sessionCallback = new SessionCallback() { @Override - public void onSessionCreated(RouteSessionController controller) { + public void onSessionCreated(RoutingController controller) { assertNotNull(controller); assertTrue(getRouteIds(controller.getSelectedRoutes()).contains(ROUTE_ID1)); assertTrue(TextUtils.equals(FEATURE_SAMPLE, controller.getRouteFeature())); @@ -653,8 +653,8 @@ public class MediaRouter2Test { } @Override - public void onSessionInfoChanged(RouteSessionController controller, - RouteSessionInfo oldInfo, RouteSessionInfo newInfo) { + public void onSessionInfoChanged(RoutingController controller, + RoutingSessionInfo oldInfo, RoutingSessionInfo newInfo) { if (onSessionCreatedLatch.getCount() != 0 || !TextUtils.equals( controllers.get(0).getSessionId(), controller.getSessionId())) { @@ -674,7 +674,7 @@ public class MediaRouter2Test { assertTrue(onSessionCreatedLatch.await(TIMEOUT_MS, TimeUnit.MILLISECONDS)); assertEquals(1, controllers.size()); - RouteSessionController controller = controllers.get(0); + RoutingController controller = controllers.get(0); assertTrue(getRouteIds(controller.getTransferrableRoutes()) .contains(ROUTE_ID5_TO_TRANSFER_TO)); @@ -732,8 +732,8 @@ public class MediaRouter2Test { } } - static void releaseControllers(@NonNull List<RouteSessionController> controllers) { - for (RouteSessionController controller : controllers) { + static void releaseControllers(@NonNull List<RoutingController> controllers) { + for (RoutingController controller : controllers) { controller.release(); } } diff --git a/media/tests/MediaRouter/src/com/android/mediaroutertest/MediaRouterManagerTest.java b/media/tests/MediaRouter/src/com/android/mediaroutertest/MediaRouterManagerTest.java index 5dabb7dd818d..ae15b913631b 100644 --- a/media/tests/MediaRouter/src/com/android/mediaroutertest/MediaRouterManagerTest.java +++ b/media/tests/MediaRouter/src/com/android/mediaroutertest/MediaRouterManagerTest.java @@ -228,7 +228,7 @@ public class MediaRouterManagerTest { addRouterCallback(new MediaRouter2.RouteCallback()); addSessionCallback(new SessionCallback() { @Override - public void onSessionCreated(MediaRouter2.RouteSessionController controller) { + public void onSessionCreated(MediaRouter2.RoutingController controller) { if (createRouteMap(controller.getSelectedRoutes()).containsKey(ROUTE_ID1)) { latch.countDown(); } diff --git a/media/tests/MediaRouter/src/com/android/mediaroutertest/RouteSessionInfoTest.java b/media/tests/MediaRouter/src/com/android/mediaroutertest/RoutingSessionInfoTest.java index 6d21b3326521..3f5973615e32 100644 --- a/media/tests/MediaRouter/src/com/android/mediaroutertest/RouteSessionInfoTest.java +++ b/media/tests/MediaRouter/src/com/android/mediaroutertest/RoutingSessionInfoTest.java @@ -22,7 +22,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.testng.Assert.assertThrows; -import android.media.RouteSessionInfo; +import android.media.RoutingSessionInfo; import android.os.Bundle; import android.os.Parcel; import android.support.test.filters.SmallTest; @@ -32,11 +32,11 @@ import org.junit.Test; import org.junit.runner.RunWith; /** - * Tests {@link RouteSessionInfo} and its {@link RouteSessionInfo.Builder builder}. + * Tests {@link RoutingSessionInfo} and its {@link RoutingSessionInfo.Builder builder}. */ @RunWith(AndroidJUnit4.class) @SmallTest -public class RouteSessionInfoTest { +public class RoutingSessionInfoTest { public static final String TEST_ID = "test_id"; public static final String TEST_CLIENT_PACKAGE_NAME = "com.test.client.package.name"; public static final String TEST_ROUTE_FEATURE = "test_route_feature"; @@ -68,71 +68,71 @@ public class RouteSessionInfoTest { final String validRouteFeature = TEST_ROUTE_FEATURE; // ID is invalid - assertThrows(IllegalArgumentException.class, () -> new RouteSessionInfo.Builder( + assertThrows(IllegalArgumentException.class, () -> new RoutingSessionInfo.Builder( nullId, validClientPackageName, validRouteFeature)); - assertThrows(IllegalArgumentException.class, () -> new RouteSessionInfo.Builder( + assertThrows(IllegalArgumentException.class, () -> new RoutingSessionInfo.Builder( emptyId, validClientPackageName, validRouteFeature)); // client package name is invalid (null) - assertThrows(NullPointerException.class, () -> new RouteSessionInfo.Builder( + assertThrows(NullPointerException.class, () -> new RoutingSessionInfo.Builder( validId, nullClientPackageName, validRouteFeature)); // route feature is invalid - assertThrows(IllegalArgumentException.class, () -> new RouteSessionInfo.Builder( + assertThrows(IllegalArgumentException.class, () -> new RoutingSessionInfo.Builder( validId, validClientPackageName, nullRouteFeature)); - assertThrows(IllegalArgumentException.class, () -> new RouteSessionInfo.Builder( + assertThrows(IllegalArgumentException.class, () -> new RoutingSessionInfo.Builder( validId, validClientPackageName, emptyRouteFeature)); // Two arguments are invalid - (1) ID and clientPackageName - assertThrows(IllegalArgumentException.class, () -> new RouteSessionInfo.Builder( + assertThrows(IllegalArgumentException.class, () -> new RoutingSessionInfo.Builder( nullId, nullClientPackageName, validRouteFeature)); - assertThrows(IllegalArgumentException.class, () -> new RouteSessionInfo.Builder( + assertThrows(IllegalArgumentException.class, () -> new RoutingSessionInfo.Builder( emptyId, nullClientPackageName, validRouteFeature)); // Two arguments are invalid - (2) ID and routeFeature - assertThrows(IllegalArgumentException.class, () -> new RouteSessionInfo.Builder( + assertThrows(IllegalArgumentException.class, () -> new RoutingSessionInfo.Builder( nullId, validClientPackageName, nullRouteFeature)); - assertThrows(IllegalArgumentException.class, () -> new RouteSessionInfo.Builder( + assertThrows(IllegalArgumentException.class, () -> new RoutingSessionInfo.Builder( nullId, validClientPackageName, emptyRouteFeature)); - assertThrows(IllegalArgumentException.class, () -> new RouteSessionInfo.Builder( + assertThrows(IllegalArgumentException.class, () -> new RoutingSessionInfo.Builder( emptyId, validClientPackageName, nullRouteFeature)); - assertThrows(IllegalArgumentException.class, () -> new RouteSessionInfo.Builder( + assertThrows(IllegalArgumentException.class, () -> new RoutingSessionInfo.Builder( emptyId, validClientPackageName, emptyRouteFeature)); // Two arguments are invalid - (3) clientPackageName and routeFeature // Note that this throws NullPointerException. - assertThrows(NullPointerException.class, () -> new RouteSessionInfo.Builder( + assertThrows(NullPointerException.class, () -> new RoutingSessionInfo.Builder( validId, nullClientPackageName, nullRouteFeature)); - assertThrows(NullPointerException.class, () -> new RouteSessionInfo.Builder( + assertThrows(NullPointerException.class, () -> new RoutingSessionInfo.Builder( validId, nullClientPackageName, emptyRouteFeature)); // All arguments are invalid - assertThrows(IllegalArgumentException.class, () -> new RouteSessionInfo.Builder( + assertThrows(IllegalArgumentException.class, () -> new RoutingSessionInfo.Builder( nullId, nullClientPackageName, nullRouteFeature)); - assertThrows(IllegalArgumentException.class, () -> new RouteSessionInfo.Builder( + assertThrows(IllegalArgumentException.class, () -> new RoutingSessionInfo.Builder( nullId, nullClientPackageName, emptyRouteFeature)); - assertThrows(IllegalArgumentException.class, () -> new RouteSessionInfo.Builder( + assertThrows(IllegalArgumentException.class, () -> new RoutingSessionInfo.Builder( emptyId, nullClientPackageName, nullRouteFeature)); - assertThrows(IllegalArgumentException.class, () -> new RouteSessionInfo.Builder( + assertThrows(IllegalArgumentException.class, () -> new RoutingSessionInfo.Builder( emptyId, nullClientPackageName, emptyRouteFeature)); // Null RouteInfo (1-argument constructor) - final RouteSessionInfo nullRouteSessionInfo = null; + final RoutingSessionInfo nullRoutingSessionInfo = null; assertThrows(NullPointerException.class, - () -> new RouteSessionInfo.Builder(nullRouteSessionInfo)); + () -> new RoutingSessionInfo.Builder(nullRoutingSessionInfo)); } @Test public void testBuilderConstructorWithEmptyClientPackageName() { // An empty string for client package name is valid. (for unknown cases) // Creating builder with it should not throw any exception. - RouteSessionInfo.Builder builder = new RouteSessionInfo.Builder( + RoutingSessionInfo.Builder builder = new RoutingSessionInfo.Builder( TEST_ID, "" /* clientPackageName*/, TEST_ROUTE_FEATURE); } @Test public void testBuilderBuildWithEmptySelectedRoutesThrowsIAE() { - RouteSessionInfo.Builder builder = new RouteSessionInfo.Builder( + RoutingSessionInfo.Builder builder = new RoutingSessionInfo.Builder( TEST_ID, TEST_CLIENT_PACKAGE_NAME, TEST_ROUTE_FEATURE); // Note: Calling build() without adding any selected routes. assertThrows(IllegalArgumentException.class, () -> builder.build()); @@ -140,7 +140,7 @@ public class RouteSessionInfoTest { @Test public void testBuilderAddRouteMethodsWithIllegalArgumentsThrowsIAE() { - RouteSessionInfo.Builder builder = new RouteSessionInfo.Builder( + RoutingSessionInfo.Builder builder = new RoutingSessionInfo.Builder( TEST_ID, TEST_CLIENT_PACKAGE_NAME, TEST_ROUTE_FEATURE); final String nullRouteId = null; @@ -167,7 +167,7 @@ public class RouteSessionInfoTest { @Test public void testBuilderRemoveRouteMethodsWithIllegalArgumentsThrowsIAE() { - RouteSessionInfo.Builder builder = new RouteSessionInfo.Builder( + RoutingSessionInfo.Builder builder = new RoutingSessionInfo.Builder( TEST_ID, TEST_CLIENT_PACKAGE_NAME, TEST_ROUTE_FEATURE); final String nullRouteId = null; @@ -193,11 +193,11 @@ public class RouteSessionInfoTest { } @Test - public void testBuilderAndGettersOfRouteSessionInfo() { + public void testBuilderAndGettersOfRoutingSessionInfo() { Bundle controlHints = new Bundle(); controlHints.putString(TEST_KEY, TEST_VALUE); - RouteSessionInfo sessionInfo = new RouteSessionInfo.Builder( + RoutingSessionInfo sessionInfo = new RoutingSessionInfo.Builder( TEST_ID, TEST_CLIENT_PACKAGE_NAME, TEST_ROUTE_FEATURE) .addSelectedRoute(TEST_ROUTE_ID_0) .addSelectedRoute(TEST_ROUTE_ID_1) @@ -238,7 +238,7 @@ public class RouteSessionInfoTest { @Test public void testBuilderAddRouteMethodsWithBuilderCopyConstructor() { - RouteSessionInfo sessionInfo = new RouteSessionInfo.Builder( + RoutingSessionInfo sessionInfo = new RoutingSessionInfo.Builder( TEST_ID, TEST_CLIENT_PACKAGE_NAME, TEST_ROUTE_FEATURE) .addSelectedRoute(TEST_ROUTE_ID_0) .addSelectableRoute(TEST_ROUTE_ID_2) @@ -246,7 +246,7 @@ public class RouteSessionInfoTest { .addTransferrableRoute(TEST_ROUTE_ID_6) .build(); - RouteSessionInfo newSessionInfo = new RouteSessionInfo.Builder(sessionInfo) + RoutingSessionInfo newSessionInfo = new RoutingSessionInfo.Builder(sessionInfo) .addSelectedRoute(TEST_ROUTE_ID_1) .addSelectableRoute(TEST_ROUTE_ID_3) .addDeselectableRoute(TEST_ROUTE_ID_5) @@ -272,7 +272,7 @@ public class RouteSessionInfoTest { @Test public void testBuilderRemoveRouteMethods() { - RouteSessionInfo sessionInfo = new RouteSessionInfo.Builder( + RoutingSessionInfo sessionInfo = new RoutingSessionInfo.Builder( TEST_ID, TEST_CLIENT_PACKAGE_NAME, TEST_ROUTE_FEATURE) .addSelectedRoute(TEST_ROUTE_ID_0) .addSelectedRoute(TEST_ROUTE_ID_1) @@ -307,7 +307,7 @@ public class RouteSessionInfoTest { @Test public void testBuilderRemoveRouteMethodsWithBuilderCopyConstructor() { - RouteSessionInfo sessionInfo = new RouteSessionInfo.Builder( + RoutingSessionInfo sessionInfo = new RoutingSessionInfo.Builder( TEST_ID, TEST_CLIENT_PACKAGE_NAME, TEST_ROUTE_FEATURE) .addSelectedRoute(TEST_ROUTE_ID_0) .addSelectedRoute(TEST_ROUTE_ID_1) @@ -319,7 +319,7 @@ public class RouteSessionInfoTest { .addTransferrableRoute(TEST_ROUTE_ID_7) .build(); - RouteSessionInfo newSessionInfo = new RouteSessionInfo.Builder(sessionInfo) + RoutingSessionInfo newSessionInfo = new RoutingSessionInfo.Builder(sessionInfo) .removeSelectedRoute(TEST_ROUTE_ID_1) .removeSelectableRoute(TEST_ROUTE_ID_3) .removeDeselectableRoute(TEST_ROUTE_ID_5) @@ -341,7 +341,7 @@ public class RouteSessionInfoTest { @Test public void testBuilderClearRouteMethods() { - RouteSessionInfo sessionInfo = new RouteSessionInfo.Builder( + RoutingSessionInfo sessionInfo = new RoutingSessionInfo.Builder( TEST_ID, TEST_CLIENT_PACKAGE_NAME, TEST_ROUTE_FEATURE) .addSelectedRoute(TEST_ROUTE_ID_0) .addSelectedRoute(TEST_ROUTE_ID_1) @@ -373,7 +373,7 @@ public class RouteSessionInfoTest { @Test public void testBuilderClearRouteMethodsWithBuilderCopyConstructor() { - RouteSessionInfo sessionInfo = new RouteSessionInfo.Builder( + RoutingSessionInfo sessionInfo = new RoutingSessionInfo.Builder( TEST_ID, TEST_CLIENT_PACKAGE_NAME, TEST_ROUTE_FEATURE) .addSelectedRoute(TEST_ROUTE_ID_0) .addSelectedRoute(TEST_ROUTE_ID_1) @@ -385,7 +385,7 @@ public class RouteSessionInfoTest { .addTransferrableRoute(TEST_ROUTE_ID_7) .build(); - RouteSessionInfo newSessionInfo = new RouteSessionInfo.Builder(sessionInfo) + RoutingSessionInfo newSessionInfo = new RoutingSessionInfo.Builder(sessionInfo) .clearSelectedRoutes() .clearSelectableRoutes() .clearDeselectableRoutes() @@ -407,7 +407,7 @@ public class RouteSessionInfoTest { Bundle controlHints = new Bundle(); controlHints.putString(TEST_KEY, TEST_VALUE); - RouteSessionInfo sessionInfo1 = new RouteSessionInfo.Builder( + RoutingSessionInfo sessionInfo1 = new RoutingSessionInfo.Builder( TEST_ID, TEST_CLIENT_PACKAGE_NAME, TEST_ROUTE_FEATURE) .addSelectedRoute(TEST_ROUTE_ID_0) .addSelectedRoute(TEST_ROUTE_ID_1) @@ -420,7 +420,7 @@ public class RouteSessionInfoTest { .setControlHints(controlHints) .build(); - RouteSessionInfo sessionInfo2 = new RouteSessionInfo.Builder( + RoutingSessionInfo sessionInfo2 = new RoutingSessionInfo.Builder( TEST_ID, TEST_CLIENT_PACKAGE_NAME, TEST_ROUTE_FEATURE) .addSelectedRoute(TEST_ROUTE_ID_0) .addSelectedRoute(TEST_ROUTE_ID_1) @@ -442,7 +442,7 @@ public class RouteSessionInfoTest { Bundle controlHints = new Bundle(); controlHints.putString(TEST_KEY, TEST_VALUE); - RouteSessionInfo sessionInfo1 = new RouteSessionInfo.Builder( + RoutingSessionInfo sessionInfo1 = new RoutingSessionInfo.Builder( TEST_ID, TEST_CLIENT_PACKAGE_NAME, TEST_ROUTE_FEATURE) .addSelectedRoute(TEST_ROUTE_ID_0) .addSelectedRoute(TEST_ROUTE_ID_1) @@ -455,7 +455,7 @@ public class RouteSessionInfoTest { .setControlHints(controlHints) .build(); - RouteSessionInfo sessionInfo2 = new RouteSessionInfo.Builder(sessionInfo1).build(); + RoutingSessionInfo sessionInfo2 = new RoutingSessionInfo.Builder(sessionInfo1).build(); assertEquals(sessionInfo1, sessionInfo2); assertEquals(sessionInfo1.hashCode(), sessionInfo2.hashCode()); @@ -466,7 +466,7 @@ public class RouteSessionInfoTest { Bundle controlHints = new Bundle(); controlHints.putString(TEST_KEY, TEST_VALUE); - RouteSessionInfo sessionInfo = new RouteSessionInfo.Builder( + RoutingSessionInfo sessionInfo = new RoutingSessionInfo.Builder( TEST_ID, TEST_CLIENT_PACKAGE_NAME, TEST_ROUTE_FEATURE) .addSelectedRoute(TEST_ROUTE_ID_0) .addSelectedRoute(TEST_ROUTE_ID_1) @@ -480,44 +480,44 @@ public class RouteSessionInfoTest { .build(); // Now, we will use copy constructor - assertNotEquals(sessionInfo, new RouteSessionInfo.Builder(sessionInfo) + assertNotEquals(sessionInfo, new RoutingSessionInfo.Builder(sessionInfo) .addSelectedRoute("randomRoute") .build()); - assertNotEquals(sessionInfo, new RouteSessionInfo.Builder(sessionInfo) + assertNotEquals(sessionInfo, new RoutingSessionInfo.Builder(sessionInfo) .addSelectableRoute("randomRoute") .build()); - assertNotEquals(sessionInfo, new RouteSessionInfo.Builder(sessionInfo) + assertNotEquals(sessionInfo, new RoutingSessionInfo.Builder(sessionInfo) .addDeselectableRoute("randomRoute") .build()); - assertNotEquals(sessionInfo, new RouteSessionInfo.Builder(sessionInfo) + assertNotEquals(sessionInfo, new RoutingSessionInfo.Builder(sessionInfo) .addTransferrableRoute("randomRoute") .build()); - assertNotEquals(sessionInfo, new RouteSessionInfo.Builder(sessionInfo) + assertNotEquals(sessionInfo, new RoutingSessionInfo.Builder(sessionInfo) .removeSelectedRoute(TEST_ROUTE_ID_1) .build()); - assertNotEquals(sessionInfo, new RouteSessionInfo.Builder(sessionInfo) + assertNotEquals(sessionInfo, new RoutingSessionInfo.Builder(sessionInfo) .removeSelectableRoute(TEST_ROUTE_ID_3) .build()); - assertNotEquals(sessionInfo, new RouteSessionInfo.Builder(sessionInfo) + assertNotEquals(sessionInfo, new RoutingSessionInfo.Builder(sessionInfo) .removeDeselectableRoute(TEST_ROUTE_ID_5) .build()); - assertNotEquals(sessionInfo, new RouteSessionInfo.Builder(sessionInfo) + assertNotEquals(sessionInfo, new RoutingSessionInfo.Builder(sessionInfo) .removeTransferrableRoute(TEST_ROUTE_ID_7) .build()); - assertNotEquals(sessionInfo, new RouteSessionInfo.Builder(sessionInfo) + assertNotEquals(sessionInfo, new RoutingSessionInfo.Builder(sessionInfo) .clearSelectedRoutes() // Note: Calling build() with empty selected routes will throw IAE. .addSelectedRoute(TEST_ROUTE_ID_0) .build()); - assertNotEquals(sessionInfo, new RouteSessionInfo.Builder(sessionInfo) + assertNotEquals(sessionInfo, new RoutingSessionInfo.Builder(sessionInfo) .clearSelectableRoutes() .build()); - assertNotEquals(sessionInfo, new RouteSessionInfo.Builder(sessionInfo) + assertNotEquals(sessionInfo, new RoutingSessionInfo.Builder(sessionInfo) .clearDeselectableRoutes() .build()); - assertNotEquals(sessionInfo, new RouteSessionInfo.Builder(sessionInfo) + assertNotEquals(sessionInfo, new RoutingSessionInfo.Builder(sessionInfo) .clearTransferrableRoutes() .build()); @@ -529,7 +529,7 @@ public class RouteSessionInfoTest { Bundle controlHints = new Bundle(); controlHints.putString(TEST_KEY, TEST_VALUE); - RouteSessionInfo sessionInfo = new RouteSessionInfo.Builder( + RoutingSessionInfo sessionInfo = new RoutingSessionInfo.Builder( TEST_ID, TEST_CLIENT_PACKAGE_NAME, TEST_ROUTE_FEATURE) .addSelectedRoute(TEST_ROUTE_ID_0) .addSelectedRoute(TEST_ROUTE_ID_1) @@ -546,7 +546,8 @@ public class RouteSessionInfoTest { sessionInfo.writeToParcel(parcel, 0); parcel.setDataPosition(0); - RouteSessionInfo sessionInfoFromParcel = RouteSessionInfo.CREATOR.createFromParcel(parcel); + RoutingSessionInfo sessionInfoFromParcel = + RoutingSessionInfo.CREATOR.createFromParcel(parcel); assertEquals(sessionInfo, sessionInfoFromParcel); assertEquals(sessionInfo.hashCode(), sessionInfoFromParcel.hashCode()); diff --git a/services/core/java/com/android/server/media/MediaRoute2Provider.java b/services/core/java/com/android/server/media/MediaRoute2Provider.java index 9c9a4121830f..2c9d702058de 100644 --- a/services/core/java/com/android/server/media/MediaRoute2Provider.java +++ b/services/core/java/com/android/server/media/MediaRoute2Provider.java @@ -21,7 +21,7 @@ import android.annotation.Nullable; import android.content.ComponentName; import android.content.Intent; import android.media.MediaRoute2ProviderInfo; -import android.media.RouteSessionInfo; +import android.media.RoutingSessionInfo; import java.util.ArrayList; import java.util.Collections; @@ -34,7 +34,7 @@ abstract class MediaRoute2Provider { Callback mCallback; private volatile MediaRoute2ProviderInfo mProviderInfo; - private volatile List<RouteSessionInfo> mSessionInfos = Collections.emptyList(); + private volatile List<RoutingSessionInfo> mSessionInfos = Collections.emptyList(); MediaRoute2Provider(@NonNull ComponentName componentName) { mComponentName = Objects.requireNonNull(componentName, "Component name must not be null."); @@ -68,12 +68,12 @@ abstract class MediaRoute2Provider { } @NonNull - public List<RouteSessionInfo> getSessionInfos() { + public List<RoutingSessionInfo> getSessionInfos() { return mSessionInfos; } void setAndNotifyProviderState(MediaRoute2ProviderInfo providerInfo, - List<RouteSessionInfo> sessionInfos) { + List<RoutingSessionInfo> sessionInfos) { if (providerInfo == null) { mProviderInfo = null; } else { @@ -81,10 +81,10 @@ abstract class MediaRoute2Provider { .setUniqueId(mUniqueId) .build(); } - List<RouteSessionInfo> sessionInfoWithProviderId = new ArrayList<RouteSessionInfo>(); - for (RouteSessionInfo sessionInfo : sessionInfos) { + List<RoutingSessionInfo> sessionInfoWithProviderId = new ArrayList<RoutingSessionInfo>(); + for (RoutingSessionInfo sessionInfo : sessionInfos) { sessionInfoWithProviderId.add( - new RouteSessionInfo.Builder(sessionInfo) + new RoutingSessionInfo.Builder(sessionInfo) .setProviderId(mUniqueId) .build()); } @@ -103,12 +103,12 @@ abstract class MediaRoute2Provider { public interface Callback { void onProviderStateChanged(@Nullable MediaRoute2Provider provider); void onSessionCreated(@NonNull MediaRoute2Provider provider, - @Nullable RouteSessionInfo sessionInfo, long requestId); + @Nullable RoutingSessionInfo sessionInfo, long requestId); // TODO: Remove this when MediaRouter2ServiceImpl notifies clients of session changes. void onSessionInfoChanged(@NonNull MediaRoute2Provider provider, - @NonNull RouteSessionInfo sessionInfo); + @NonNull RoutingSessionInfo sessionInfo); // TODO: Call this when service actually notifies of session release. void onSessionReleased(@NonNull MediaRoute2Provider provider, - @NonNull RouteSessionInfo sessionInfo); + @NonNull RoutingSessionInfo sessionInfo); } } diff --git a/services/core/java/com/android/server/media/MediaRoute2ProviderProxy.java b/services/core/java/com/android/server/media/MediaRoute2ProviderProxy.java index 635983575226..c0ad46f5fa06 100644 --- a/services/core/java/com/android/server/media/MediaRoute2ProviderProxy.java +++ b/services/core/java/com/android/server/media/MediaRoute2ProviderProxy.java @@ -26,7 +26,7 @@ import android.media.IMediaRoute2Provider; import android.media.IMediaRoute2ProviderClient; import android.media.MediaRoute2ProviderInfo; import android.media.MediaRoute2ProviderService; -import android.media.RouteSessionInfo; +import android.media.RoutingSessionInfo; import android.os.Handler; import android.os.IBinder; import android.os.IBinder.DeathRecipient; @@ -270,7 +270,7 @@ final class MediaRoute2ProviderProxy extends MediaRoute2Provider implements Serv } private void onProviderStateUpdated(Connection connection, - MediaRoute2ProviderInfo providerInfo, List<RouteSessionInfo> sessionInfos) { + MediaRoute2ProviderInfo providerInfo, List<RoutingSessionInfo> sessionInfos) { if (mActiveConnection != connection) { return; } @@ -280,20 +280,20 @@ final class MediaRoute2ProviderProxy extends MediaRoute2Provider implements Serv setAndNotifyProviderState(providerInfo, sessionInfos); } - private void onSessionCreated(Connection connection, @Nullable RouteSessionInfo sessionInfo, + private void onSessionCreated(Connection connection, @Nullable RoutingSessionInfo sessionInfo, long requestId) { if (mActiveConnection != connection) { return; } if (sessionInfo != null) { - sessionInfo = new RouteSessionInfo.Builder(sessionInfo) + sessionInfo = new RoutingSessionInfo.Builder(sessionInfo) .setProviderId(getUniqueId()) .build(); } mCallback.onSessionCreated(this, sessionInfo, requestId); } - private void onSessionInfoChanged(Connection connection, RouteSessionInfo sessionInfo) { + private void onSessionInfoChanged(Connection connection, RoutingSessionInfo sessionInfo) { if (mActiveConnection != connection) { return; } @@ -303,7 +303,7 @@ final class MediaRoute2ProviderProxy extends MediaRoute2Provider implements Serv return; } - sessionInfo = new RouteSessionInfo.Builder(sessionInfo) + sessionInfo = new RoutingSessionInfo.Builder(sessionInfo) .setProviderId(getUniqueId()) .build(); @@ -422,17 +422,17 @@ final class MediaRoute2ProviderProxy extends MediaRoute2Provider implements Serv } void postProviderStateUpdated(MediaRoute2ProviderInfo providerInfo, - List<RouteSessionInfo> sessionInfos) { + List<RoutingSessionInfo> sessionInfos) { mHandler.post(() -> onProviderStateUpdated(Connection.this, providerInfo, sessionInfos)); } - void postSessionCreated(@Nullable RouteSessionInfo sessionInfo, long requestId) { + void postSessionCreated(@Nullable RoutingSessionInfo sessionInfo, long requestId) { mHandler.post(() -> onSessionCreated(Connection.this, sessionInfo, requestId)); } - void postSessionInfoChanged(RouteSessionInfo sessionInfo) { + void postSessionInfoChanged(RoutingSessionInfo sessionInfo) { mHandler.post(() -> onSessionInfoChanged(Connection.this, sessionInfo)); } } @@ -450,7 +450,7 @@ final class MediaRoute2ProviderProxy extends MediaRoute2Provider implements Serv @Override public void updateState(MediaRoute2ProviderInfo providerInfo, - List<RouteSessionInfo> sessionInfos) { + List<RoutingSessionInfo> sessionInfos) { Connection connection = mConnectionRef.get(); if (connection != null) { connection.postProviderStateUpdated(providerInfo, sessionInfos); @@ -458,7 +458,7 @@ final class MediaRoute2ProviderProxy extends MediaRoute2Provider implements Serv } @Override - public void notifySessionCreated(@Nullable RouteSessionInfo sessionInfo, long requestId) { + public void notifySessionCreated(@Nullable RoutingSessionInfo sessionInfo, long requestId) { Connection connection = mConnectionRef.get(); if (connection != null) { connection.postSessionCreated(sessionInfo, requestId); @@ -466,7 +466,7 @@ final class MediaRoute2ProviderProxy extends MediaRoute2Provider implements Serv } @Override - public void notifySessionInfoChanged(RouteSessionInfo sessionInfo) { + public void notifySessionInfoChanged(RoutingSessionInfo sessionInfo) { Connection connection = mConnectionRef.get(); if (connection != null) { connection.postSessionInfoChanged(sessionInfo); diff --git a/services/core/java/com/android/server/media/MediaRouter2ServiceImpl.java b/services/core/java/com/android/server/media/MediaRouter2ServiceImpl.java index 771edb26624d..c48c90db30d1 100644 --- a/services/core/java/com/android/server/media/MediaRouter2ServiceImpl.java +++ b/services/core/java/com/android/server/media/MediaRouter2ServiceImpl.java @@ -32,7 +32,7 @@ import android.media.IMediaRouter2Manager; import android.media.MediaRoute2Info; import android.media.MediaRoute2ProviderInfo; import android.media.RouteDiscoveryPreference; -import android.media.RouteSessionInfo; +import android.media.RoutingSessionInfo; import android.os.Binder; import android.os.Bundle; import android.os.Handler; @@ -370,7 +370,7 @@ class MediaRouter2ServiceImpl { } @NonNull - public List<RouteSessionInfo> getActiveSessions(IMediaRouter2Manager manager) { + public List<RoutingSessionInfo> getActiveSessions(IMediaRouter2Manager manager) { final long token = Binder.clearCallingIdentity(); try { synchronized (mLock) { @@ -653,7 +653,7 @@ class MediaRouter2ServiceImpl { } } - private List<RouteSessionInfo> getActiveSessionsLocked(IMediaRouter2Manager manager) { + private List<RoutingSessionInfo> getActiveSessionsLocked(IMediaRouter2Manager manager) { final IBinder binder = manager.asBinder(); ManagerRecord managerRecord = mAllManagerRecords.get(binder); @@ -661,7 +661,7 @@ class MediaRouter2ServiceImpl { return Collections.emptyList(); } - List<RouteSessionInfo> sessionInfos = new ArrayList<>(); + List<RoutingSessionInfo> sessionInfos = new ArrayList<>(); for (MediaRoute2Provider provider : managerRecord.mUserRecord.mHandler.mMediaProviders) { sessionInfos.addAll(provider.getSessionInfos()); } @@ -876,20 +876,21 @@ class MediaRouter2ServiceImpl { @Override public void onSessionCreated(@NonNull MediaRoute2Provider provider, - @Nullable RouteSessionInfo sessionInfo, long requestId) { + @Nullable RoutingSessionInfo sessionInfo, long requestId) { sendMessage(PooledLambda.obtainMessage(UserHandler::onSessionCreatedOnHandler, this, provider, sessionInfo, requestId)); } @Override public void onSessionInfoChanged(@NonNull MediaRoute2Provider provider, - @NonNull RouteSessionInfo sessionInfo) { + @NonNull RoutingSessionInfo sessionInfo) { sendMessage(PooledLambda.obtainMessage(UserHandler::onSessionInfoChangedOnHandler, this, provider, sessionInfo)); } @Override - public void onSessionReleased(MediaRoute2Provider provider, RouteSessionInfo sessionInfo) { + public void onSessionReleased(MediaRoute2Provider provider, + RoutingSessionInfo sessionInfo) { sendMessage(PooledLambda.obtainMessage(UserHandler::onSessionReleasedOnHandler, this, provider, sessionInfo)); } @@ -1131,7 +1132,7 @@ class MediaRouter2ServiceImpl { } private void onSessionCreatedOnHandler(@NonNull MediaRoute2Provider provider, - @Nullable RouteSessionInfo sessionInfo, long requestId) { + @Nullable RoutingSessionInfo sessionInfo, long requestId) { SessionCreationRequest matchingRequest = null; for (SessionCreationRequest request : mSessionCreationRequests) { @@ -1182,7 +1183,7 @@ class MediaRouter2ServiceImpl { } private void onSessionInfoChangedOnHandler(@NonNull MediaRoute2Provider provider, - @NonNull RouteSessionInfo sessionInfo) { + @NonNull RoutingSessionInfo sessionInfo) { Client2Record client2Record = mSessionToClientMap.get( sessionInfo.getId()); @@ -1196,7 +1197,7 @@ class MediaRouter2ServiceImpl { } private void onSessionReleasedOnHandler(@NonNull MediaRoute2Provider provider, - @NonNull RouteSessionInfo sessionInfo) { + @NonNull RoutingSessionInfo sessionInfo) { Client2Record client2Record = mSessionToClientMap.get(sessionInfo.getId()); if (client2Record == null) { @@ -1208,8 +1209,8 @@ class MediaRouter2ServiceImpl { // TODO: Tell managers for the session release } - private void notifySessionCreated(Client2Record clientRecord, RouteSessionInfo sessionInfo, - int requestId) { + private void notifySessionCreated(Client2Record clientRecord, + RoutingSessionInfo sessionInfo, int requestId) { try { clientRecord.mClient.notifySessionCreated(sessionInfo, requestId); } catch (RemoteException ex) { @@ -1228,7 +1229,7 @@ class MediaRouter2ServiceImpl { } private void notifySessionInfoChanged(Client2Record clientRecord, - RouteSessionInfo sessionInfo) { + RoutingSessionInfo sessionInfo) { try { clientRecord.mClient.notifySessionInfoChanged(sessionInfo); } catch (RemoteException ex) { @@ -1238,7 +1239,7 @@ class MediaRouter2ServiceImpl { } private void notifySessionReleased(Client2Record clientRecord, - RouteSessionInfo sessionInfo) { + RoutingSessionInfo sessionInfo) { try { clientRecord.mClient.notifySessionReleased(sessionInfo); } catch (RemoteException ex) { diff --git a/services/core/java/com/android/server/media/MediaRouterService.java b/services/core/java/com/android/server/media/MediaRouterService.java index 2dbaab4c893a..b7aa484a3fc7 100644 --- a/services/core/java/com/android/server/media/MediaRouterService.java +++ b/services/core/java/com/android/server/media/MediaRouterService.java @@ -40,7 +40,7 @@ import android.media.MediaRouterClientState; import android.media.RemoteDisplayState; import android.media.RemoteDisplayState.RemoteDisplayInfo; import android.media.RouteDiscoveryPreference; -import android.media.RouteSessionInfo; +import android.media.RoutingSessionInfo; import android.os.Binder; import android.os.Handler; import android.os.IBinder; @@ -552,7 +552,7 @@ public final class MediaRouterService extends IMediaRouterService.Stub // Binder call @Override - public List<RouteSessionInfo> getActiveSessions(IMediaRouter2Manager manager) { + public List<RoutingSessionInfo> getActiveSessions(IMediaRouter2Manager manager) { return mService2.getActiveSessions(manager); } |