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
9743e47f
authored
Jul 27, 2020
by
jaewan
Committed by
Oliver Woodman
Jul 27, 2020
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Remove unncessary TODOs
PiperOrigin-RevId: 323286632
parent
5fa7b879
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
0 additions
and
36 deletions
extensions/media2/src/androidTest/java/com/google/android/exoplayer2/ext/media2/SessionCallbackBuilderTest.java
extensions/media2/src/androidTest/java/com/google/android/exoplayer2/ext/media2/SessionPlayerConnectorTest.java
extensions/media2/src/main/java/com/google/android/exoplayer2/ext/media2/TimelinePlaylistManager.java
extensions/media2/src/androidTest/java/com/google/android/exoplayer2/ext/media2/SessionCallbackBuilderTest.java
View file @
9743e47f
...
@@ -23,7 +23,6 @@ import static com.google.common.truth.Truth.assertWithMessage;
...
@@ -23,7 +23,6 @@ import static com.google.common.truth.Truth.assertWithMessage;
import
android.content.Context
;
import
android.content.Context
;
import
android.net.Uri
;
import
android.net.Uri
;
import
android.os.Bundle
;
import
android.os.Bundle
;
import
android.os.Looper
;
import
android.text.TextUtils
;
import
android.text.TextUtils
;
import
androidx.annotation.NonNull
;
import
androidx.annotation.NonNull
;
import
androidx.annotation.Nullable
;
import
androidx.annotation.Nullable
;
...
@@ -79,11 +78,6 @@ public class SessionCallbackBuilderTest {
...
@@ -79,11 +78,6 @@ public class SessionCallbackBuilderTest {
@Before
@Before
public
void
setUp
()
{
public
void
setUp
()
{
// Workaround to instantiate MediaSession with public androidx.media dependency.
// TODO(jaewan): Remove this workaround when androidx.media 1.2.0 is released.
if
(
Looper
.
myLooper
()
==
null
)
{
Looper
.
prepare
();
}
context
=
ApplicationProvider
.
getApplicationContext
();
context
=
ApplicationProvider
.
getApplicationContext
();
executor
=
playerTestRule
.
getExecutor
();
executor
=
playerTestRule
.
getExecutor
();
sessionPlayerConnector
=
playerTestRule
.
getSessionPlayerConnector
();
sessionPlayerConnector
=
playerTestRule
.
getSessionPlayerConnector
();
...
...
extensions/media2/src/androidTest/java/com/google/android/exoplayer2/ext/media2/SessionPlayerConnectorTest.java
View file @
9743e47f
...
@@ -64,7 +64,6 @@ import java.util.concurrent.Executor;
...
@@ -64,7 +64,6 @@ import java.util.concurrent.Executor;
import
java.util.concurrent.TimeUnit
;
import
java.util.concurrent.TimeUnit
;
import
java.util.concurrent.atomic.AtomicLong
;
import
java.util.concurrent.atomic.AtomicLong
;
import
org.junit.Before
;
import
org.junit.Before
;
import
org.junit.Ignore
;
import
org.junit.Rule
;
import
org.junit.Rule
;
import
org.junit.Test
;
import
org.junit.Test
;
import
org.junit.runner.RunWith
;
import
org.junit.runner.RunWith
;
...
@@ -961,34 +960,6 @@ public class SessionPlayerConnectorTest {
...
@@ -961,34 +960,6 @@ public class SessionPlayerConnectorTest {
@Test
@Test
@LargeTest
@LargeTest
@Ignore
(
"setMediaItem() is currently implemented with setPlaylist(), so list isn't empty."
)
@SdkSuppress
(
minSdkVersion
=
Build
.
VERSION_CODES
.
KITKAT
)
public
void
setMediaItem_afterSettingPlaylist_notifiesOnPlaylistChangedWithNullList
()
throws
Exception
{
List
<
MediaItem
>
playlist
=
TestUtils
.
createPlaylist
(
context
,
/* size= */
10
);
CountDownLatch
onPlaylistBecomesNullLatch
=
new
CountDownLatch
(
1
);
sessionPlayerConnector
.
registerPlayerCallback
(
executor
,
new
SessionPlayer
.
PlayerCallback
()
{
@Override
public
void
onPlaylistChanged
(
@NonNull
SessionPlayer
player
,
@Nullable
List
<
MediaItem
>
list
,
@Nullable
MediaMetadata
metadata
)
{
if
(
list
==
null
)
{
onPlaylistBecomesNullLatch
.
countDown
();
}
}
});
sessionPlayerConnector
.
setPlaylist
(
playlist
,
/* metadata= */
null
);
sessionPlayerConnector
.
setMediaItem
(
playlist
.
get
(
0
));
assertThat
(
onPlaylistBecomesNullLatch
.
await
(
PLAYLIST_CHANGE_WAIT_TIME_MS
,
TimeUnit
.
MILLISECONDS
))
.
isTrue
();
}
@Test
@LargeTest
@SdkSuppress
(
minSdkVersion
=
Build
.
VERSION_CODES
.
KITKAT
)
@SdkSuppress
(
minSdkVersion
=
Build
.
VERSION_CODES
.
KITKAT
)
public
void
setPlaylist_withPlaylist_notifiesOnCurrentMediaItemChanged
()
throws
Exception
{
public
void
setPlaylist_withPlaylist_notifiesOnCurrentMediaItemChanged
()
throws
Exception
{
int
listSize
=
2
;
int
listSize
=
2
;
...
...
extensions/media2/src/main/java/com/google/android/exoplayer2/ext/media2/TimelinePlaylistManager.java
View file @
9743e47f
...
@@ -218,7 +218,6 @@ public class TimelinePlaylistManager implements PlaylistManager {
...
@@ -218,7 +218,6 @@ public class TimelinePlaylistManager implements PlaylistManager {
@Override
@Override
public
boolean
setMediaItem
(
Player
player
,
MediaItem
mediaItem
)
{
public
boolean
setMediaItem
(
Player
player
,
MediaItem
mediaItem
)
{
// TODO(jaewan): Distinguish setMediaItem(item) and setPlaylist({item})
List
<
MediaItem
>
playlist
=
new
ArrayList
<>();
List
<
MediaItem
>
playlist
=
new
ArrayList
<>();
playlist
.
add
(
mediaItem
);
playlist
.
add
(
mediaItem
);
return
setPlaylist
(
player
,
playlist
,
/* metadata */
null
);
return
setPlaylist
(
player
,
playlist
,
/* metadata */
null
);
...
...
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