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

Commit 52cf7116 authored by Joseph Pirozzo's avatar Joseph Pirozzo Committed by android-build-merger
Browse files

Merge "AVRCP Controller BrowseTree instantiation" into qt-dev am: a53cfbde 

am: aa47ad77

Change-Id: I6e0951d71f588919235de98f95c2f196707a7ab9
parents 31c509bf aa47ad77

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -103,7 +103,7 @@ class AvrcpControllerStateMachine extends StateMachine { 




    boolean mRemoteControlConnected = false;

    boolean mRemoteControlConnected = false;

    boolean mBrowsingConnected = false;

    boolean mBrowsingConnected = false;

    BrowseTree mBrowseTree = null;

    final BrowseTree mBrowseTree;

    private AvrcpPlayer mAddressedPlayer = new AvrcpPlayer();

    private AvrcpPlayer mAddressedPlayer = new AvrcpPlayer();

    private int mAddressedPlayerId = -1;

    private int mAddressedPlayerId = -1;

    private SparseArray<AvrcpPlayer> mAvailablePlayerList = new SparseArray<AvrcpPlayer>();

    private SparseArray<AvrcpPlayer> mAvailablePlayerList = new SparseArray<AvrcpPlayer>();
@@ -123,6 +123,7 @@ class AvrcpControllerStateMachine extends StateMachine { 
        mService = service;

        mService = service;

        logD(device.toString());

        logD(device.toString());





        mBrowseTree = new BrowseTree(mDevice);

        mDisconnected = new Disconnected();

        mDisconnected = new Disconnected();

        mConnecting = new Connecting();

        mConnecting = new Connecting();

        mConnected = new Connected();

        mConnected = new Connected();
@@ -205,7 +206,6 @@ class AvrcpControllerStateMachine extends StateMachine { 




    synchronized void onBrowsingConnected() {

    synchronized void onBrowsingConnected() {

        if (mBrowsingConnected) return;

        if (mBrowsingConnected) return;

        mBrowseTree = new BrowseTree(mDevice);

        mService.sBrowseTree.mRootNode.addChild(mBrowseTree.mRootNode);

        mService.sBrowseTree.mRootNode.addChild(mBrowseTree.mRootNode);

        BluetoothMediaBrowserService.notifyChanged(mService

        BluetoothMediaBrowserService.notifyChanged(mService

                .sBrowseTree.mRootNode);

                .sBrowseTree.mRootNode);