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

Commit e02cb172 authored by Joseph Pirozzo's avatar Joseph Pirozzo
Browse files

AVRCP Controller BrowseTree instantiation 

Tag mBrowseTree as final such that it can never be null

Bug: 135066117
Test: atest com.android.bluetooth.avrcpcontroller.AvrcpControllerStateMachineTest
Change-Id: Id28ce2cbb703d79be63561f95a051bf9953d64b0
Merged-In: Id28ce2cbb703d79be63561f95a051bf9953d64b0
parent 2fc4c734

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

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


    boolean mRemoteControlConnected = false;

    boolean mBrowsingConnected = false;

    BrowseTree mBrowseTree = null;

    final BrowseTree mBrowseTree;

    private AvrcpPlayer mAddressedPlayer = new AvrcpPlayer();

    private int mAddressedPlayerId = -1;

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

        logD(device.toString());



        mBrowseTree = new BrowseTree(mDevice);

        mDisconnected = new Disconnected();

        mConnecting = new Connecting();

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


    synchronized void onBrowsingConnected() {

        if (mBrowsingConnected) return;

        mBrowseTree = new BrowseTree(mDevice);

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

        BluetoothMediaBrowserService.notifyChanged(mService

                .sBrowseTree.mRootNode);