Merge "Make getRoutingSessionInfo() public" (e34b8dc6) · Commits · e / os / android_frameworks_base

core/api/current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -24051,6 +24051,7 @@ package android.media {
		method @Nullable public android.os.Bundle getControlHints();
		method @NonNull public java.util.List<android.media.MediaRoute2Info> getDeselectableRoutes();
		method @NonNull public String getId();
		method @NonNull public android.media.RoutingSessionInfo getRoutingSessionInfo();
		method @NonNull public java.util.List<android.media.MediaRoute2Info> getSelectableRoutes();
		method @NonNull public java.util.List<android.media.MediaRoute2Info> getSelectedRoutes();
		method public int getVolume();

+10 −7

Original line number	Diff line number	Diff line
		@@ -1514,6 +1514,16 @@ public final class MediaRouter2 {
		return getRoutesWithIds(deselectableRouteIds);
		}

		/**
		* Returns the current {@link RoutingSessionInfo} associated to this controller.
		*/
		@NonNull
		public RoutingSessionInfo getRoutingSessionInfo() {
		synchronized (mControllerLock) {
		return mSessionInfo;
		}
		}

		/**
		* Gets the information about how volume is handled on the session.
		*
		@@ -1873,13 +1883,6 @@ public final class MediaRouter2 {
		return result.toString();
		}

		@NonNull
		RoutingSessionInfo getRoutingSessionInfo() {
		synchronized (mControllerLock) {
		return mSessionInfo;
		}
		}

		void setRoutingSessionInfo(@NonNull RoutingSessionInfo info) {
		synchronized (mControllerLock) {
		mSessionInfo = info;