Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 271b6fb8 authored by Kai Wang's avatar Kai Wang Committed by android-build-merger
Browse files

Merge "AvrcpCtrSM send INTERNAL_CMD_TIMEOUT" am: 97c559ab am: 7fe63936 

am: a9837552

Change-Id: I33e4bf6ec5fb1375851c6d69b8f6e66278cb4c7a
parents 206f8ebb a9837552

android/app/src/com/android/bluetooth/avrcpcontroller/AvrcpControllerStateMachine.java

+7 −1
Original line number Diff line number Diff line
@@ -544,9 +544,10 @@ class AvrcpControllerStateMachine extends StateMachine { 


        @Override

        public void enter() {

            // Setup the timeouts.

            super.enter();

            mCurrInd = 0;

            mFolderList.clear();



            callNativeFunctionForScope(mStartInd,

                    Math.min(mEndInd, mStartInd + GET_FOLDER_ITEMS_PAGINATION_SIZE - 1));

        }
@@ -745,6 +746,11 @@ class AvrcpControllerStateMachine extends StateMachine { 
                    sendMessage(MESSAGE_INTERNAL_MOVE_N_LEVELS_UP);

                    break;



                case MESSAGE_INTERNAL_CMD_TIMEOUT:

                    broadcastFolderList(BrowseTree.ROOT, EMPTY_MEDIA_ITEM_LIST);

                    transitionTo(mConnected);

                    break;



                default:

                    Log.d(STATE_TAG, "deferring message " + msg + " to connected!");

                    deferMessage(msg);