commit 2e6d5bbf101553d29a05067f9543be81fe7ab92c
author Alan Viverette <alanv@google.com> Tue May 02 15:53:19 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue May 02 15:53:19 2017 +0000
tree 1688eef122b2e6f4cdf068de7985e3d89b1a6bb4
parent 002ba29f89b9b8f8a6e6a0663565319a4fe26fbd
parent 9305871fc0013c451f33e56229507be0a1e120c6

Use AAPT2 am: f5cc075f37
am: 9305871fc0

Change-Id: I2d6acbca04327c0d558675b57271ad1af1d57ece

src/com/android/car/media/localmediaplayer/Player.java

diff --git a/src/com/android/car/media/localmediaplayer/Player.java b/src/com/android/car/media/localmediaplayer/Player.java
index 32ec372..8a6aae9 100644
--- a/src/com/android/car/media/localmediaplayer/Player.java
+++ b/src/com/android/car/media/localmediaplayer/Player.java
@@ -426,7 +426,7 @@
         // playing and a loading MediaPlayer and juggled between them while also calling
         // setNextMediaPlayer.
 
-        if (mQueue != null) {
+        if (mQueue != null && !mQueue.isEmpty()) {
             // Keep looping around when we run off the end of our current queue.
             mCurrentQueueIdx = (mCurrentQueueIdx + 1) % mQueue.size();
             playCurrentQueueIndex();