Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
SDK
/
exoplayer
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
7af9f020
authored
May 30, 2022
by
bachinger
Committed by
Marc Baechinger
May 30, 2022
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Add a constant for the legacy controller version
PiperOrigin-RevId: 451857459
parent
581c6b54
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
4 deletions
libraries/session/src/main/java/androidx/media3/session/MediaLibraryServiceLegacyStub.java
libraries/session/src/main/java/androidx/media3/session/MediaSession.java
libraries/session/src/main/java/androidx/media3/session/MediaSessionLegacyStub.java
libraries/session/src/main/java/androidx/media3/session/MediaSessionServiceLegacyStub.java
libraries/session/src/main/java/androidx/media3/session/MediaLibraryServiceLegacyStub.java
View file @
7af9f020
...
@@ -317,7 +317,7 @@ import java.util.concurrent.atomic.AtomicReference;
...
@@ -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
);
...
...
libraries/session/src/main/java/androidx/media3/session/MediaSession.java
View file @
7af9f020
...
@@ -322,6 +322,9 @@ public class MediaSession {
...
@@ -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 {
...
@@ -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
);
...
...
libraries/session/src/main/java/androidx/media3/session/MediaSessionLegacyStub.java
View file @
7af9f020
...
@@ -709,7 +709,7 @@ import org.checkerframework.checker.initialization.qual.Initialized;
...
@@ -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
);
...
...
libraries/session/src/main/java/androidx/media3/session/MediaSessionServiceLegacyStub.java
View file @
7af9f020
...
@@ -95,7 +95,7 @@ import java.util.concurrent.atomic.AtomicReference;
...
@@ -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
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment