loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add a constant for the legacy controller version

Browse Source 
PiperOrigin-RevId: 451857459
This commit is contained in:
bachinger 2022-05-30 12:32:43 +00:00 committed by Marc Baechinger
parent 581c6b5429
commit 7af9f02067
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/session/src/main/java/androidx/media3/session/MediaLibraryServiceLegacyStub.java
View File

@ -317,7 +317,7 @@ import java.util.concurrent.atomic.AtomicReference;
public ControllerInfo createControllerInfo(RemoteUserInfo remoteUserInfo) { public ControllerInfo createControllerInfo(RemoteUserInfo remoteUserInfo) {
return new ControllerInfo( return new ControllerInfo(
remoteUserInfo, remoteUserInfo,
/* controllerVersion= */ 0, ControllerInfo.LEGACY_CONTROLLER_VERSION,
getMediaSessionManager().isTrustedForMediaControl(remoteUserInfo), getMediaSessionManager().isTrustedForMediaControl(remoteUserInfo),
new BrowserLegacyCb(remoteUserInfo), new BrowserLegacyCb(remoteUserInfo),
/* connectionHints= */ Bundle.EMPTY); /* connectionHints= */ Bundle.EMPTY);

5
libraries/session/src/main/java/androidx/media3/session/MediaSession.java
View File

@ -322,6 +322,9 @@ public class MediaSession {
/** Information of a {@link MediaController} or a {@link MediaBrowser}. */ /** Information of a {@link MediaController} or a {@link MediaBrowser}. */
public static final class ControllerInfo { public static final class ControllerInfo {
/** The {@linkplain #getControllerVersion() controller version} of legacy controllers. */
public static final int LEGACY_CONTROLLER_VERSION = 0;
private final RemoteUserInfo remoteUserInfo; private final RemoteUserInfo remoteUserInfo;
private final int controllerVersion; private final int controllerVersion;
private final boolean isTrusted; private final boolean isTrusted;
@ -454,7 +457,7 @@ public class MediaSession {
/* uid= */ RemoteUserInfo.UNKNOWN_UID); /* uid= */ RemoteUserInfo.UNKNOWN_UID);
return new ControllerInfo( return new ControllerInfo(
legacyRemoteUserInfo, legacyRemoteUserInfo,
/* controllerVersion= */ 0, ControllerInfo.LEGACY_CONTROLLER_VERSION,
/* trusted= */ false, /* trusted= */ false,
/* cb= */ null, /* cb= */ null,
/* connectionHints= */ Bundle.EMPTY); /* connectionHints= */ Bundle.EMPTY);

2
libraries/session/src/main/java/androidx/media3/session/MediaSessionLegacyStub.java
View File

@ -709,7 +709,7 @@ import org.checkerframework.checker.initialization.qual.Initialized;
controller = controller =
new ControllerInfo( new ControllerInfo(
remoteUserInfo, remoteUserInfo,
/* controllerVersion= */ 0, ControllerInfo.LEGACY_CONTROLLER_VERSION,
sessionManager.isTrustedForMediaControl(remoteUserInfo), sessionManager.isTrustedForMediaControl(remoteUserInfo),
controllerCb, controllerCb,
/* connectionHints= */ Bundle.EMPTY); /* connectionHints= */ Bundle.EMPTY);

2
libraries/session/src/main/java/androidx/media3/session/MediaSessionServiceLegacyStub.java
View File

@ -95,7 +95,7 @@ import java.util.concurrent.atomic.AtomicReference;
public ControllerInfo createControllerInfo(RemoteUserInfo info) { public ControllerInfo createControllerInfo(RemoteUserInfo info) {
return new ControllerInfo( return new ControllerInfo(
info, info,
/* controllerVersion= */ 0, ControllerInfo.LEGACY_CONTROLLER_VERSION,
manager.isTrustedForMediaControl(info), manager.isTrustedForMediaControl(info),
/* cb= */ null, /* cb= */ null,
/* connectionHints= */ Bundle.EMPTY); /* connectionHints= */ Bundle.EMPTY);