commit fba9ebdfd9a1d1ee1fc6dc36b3c5a2d1d333b97e
author Treehugger Robot <android-build-prod@system.gserviceaccount.com> Mon Oct 21 18:08:51 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Oct 21 18:08:51 2019 +0000
tree 9463b32f1e6831bd3aab658d5b34c78da66ef1b6
parent f8804e8870f253695c3e243f5dc303c85a8c35d0
parent 01d93c2be6510a33f1df702fa0284898fc345268

Merge "AVRCP_Browse: Don't peek/pop elements from empty stack" into p-keystone-qcom

src/com/android/bluetooth/avrcp/BrowsedMediaPlayer.java

diff --git a/src/com/android/bluetooth/avrcp/BrowsedMediaPlayer.java b/src/com/android/bluetooth/avrcp/BrowsedMediaPlayer.java
index 0ed0f59..c1dba46 100644
--- a/src/com/android/bluetooth/avrcp/BrowsedMediaPlayer.java
+++ b/src/com/android/bluetooth/avrcp/BrowsedMediaPlayer.java
@@ -706,7 +706,10 @@
                 mPathStack.push(newPath);
             }
         } else if (direction == AvrcpConstants.DIR_UP) { /* move up */
-            if (!isBrowsableFolderUp()) {
+            if (mPathStack == null || mPathStack.isEmpty()) {
+                Log.w(TAG, "Path Stack not initialized send internal error!");
+                mMediaInterface.changePathRsp(mBDAddr, AvrcpConstants.RSP_INTERNAL_ERR, 0);
+            } else if (!isBrowsableFolderUp()) {
                 /* Already on the root, cannot allow up: PTS: test case TC_TG_MCN_CB_BI_02_C
                  * This is required, otherwise some CT will keep on sending change path up
                  * until they receive error */