commit 4ee2b85ad93152ee429b69262a25b4c640e58587
author Joseph Pirozzo <pirozzoj@google.com> Fri Aug 09 17:33:36 2019 -0700
committer Joseph Pirozzo <pirozzoj@google.com> Mon Mar 16 18:45:59 2020 +0000
tree fabae08179a583f035e0953ea55094917c746eca
parent fdba1f6020b53a5aeaf67776c36caafb16ca0c32

AVRCP Controller onSkipToQueueItem invalid

Prevent exceptions where skip to queue item results in an invalid song.

Bug: 138803592
Test: atest com.android.bluetooth.avrcpcontroller.AvrcpControllerStateMachineTest#testSkipToQueueInvalid
Change-Id: Icb9b0e85188335299fb62f0b30ada0a005ad20a3
(cherry picked from commit 4eec318acc6cd14e09d5f8ef3495aee8a7317b8c)

Merged-In: Icb9b0e85188335299fb62f0b30ada0a005ad20a3
Change-Id: I4adeb57c190c8214c83a153161ac138a8cd6ad51

src/com/android/bluetooth/avrcpcontroller/BrowseTree.java

diff --git a/src/com/android/bluetooth/avrcpcontroller/BrowseTree.java b/src/com/android/bluetooth/avrcpcontroller/BrowseTree.java
index accea2a..923282d 100644
--- a/src/com/android/bluetooth/avrcpcontroller/BrowseTree.java
+++ b/src/com/android/bluetooth/avrcpcontroller/BrowseTree.java
@@ -100,7 +100,7 @@
     }
 
     BrowseNode getTrackFromNowPlayingList(int trackNumber) {
-        return mNowPlayingNode.mChildren.get(trackNumber);
+        return mNowPlayingNode.getChild(trackNumber);
     }
 
     // Each node of the tree is represented by Folder ID, Folder Name and the children.
@@ -218,6 +218,13 @@
             return mChildren;
         }
 
+        synchronized BrowseNode getChild(int index) {
+            if (index < 0 || index >= mChildren.size()) {
+                return null;
+            }
+            return mChildren.get(index);
+        }
+
         synchronized BrowseNode getParent() {
             return mParent;
         }

tests/unit/src/com/android/bluetooth/avrcpcontroller/AvrcpControllerStateMachineTest.java

diff --git a/tests/unit/src/com/android/bluetooth/avrcpcontroller/AvrcpControllerStateMachineTest.java b/tests/unit/src/com/android/bluetooth/avrcpcontroller/AvrcpControllerStateMachineTest.java
index c766c7c..f8ab6bb 100644
--- a/tests/unit/src/com/android/bluetooth/avrcpcontroller/AvrcpControllerStateMachineTest.java
+++ b/tests/unit/src/com/android/bluetooth/avrcpcontroller/AvrcpControllerStateMachineTest.java
@@ -365,6 +365,31 @@
     }
 
     /**
+     * Test media browser skip to queue item
+     */
+    @Test
+    public void testSkipToQueueInvalid() throws Exception {
+        byte scope = 1;
+        int minSize = 0;
+        int maxSize = 255;
+        setUpConnectedState(true, true);
+        MediaControllerCompat.TransportControls transportControls =
+                BluetoothMediaBrowserService.getTransportControls();
+
+        //Play an invalid item below start
+        transportControls.skipToQueueItem(minSize - 1);
+        verify(mAvrcpControllerService,
+                timeout(ASYNC_CALL_TIMEOUT_MILLIS).times(0)).playItemNative(
+                eq(mTestAddress), eq(scope), anyLong(), anyInt());
+
+        //Play an invalid item beyond end
+        transportControls.skipToQueueItem(maxSize + 1);
+        verify(mAvrcpControllerService,
+                timeout(ASYNC_CALL_TIMEOUT_MILLIS).times(0)).playItemNative(
+                eq(mTestAddress), eq(scope), anyLong(), anyInt());
+    }
+
+    /**
      * Test media browser shuffle command
      */
     @Test