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

Commit fde29aa7 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 5688292 from a44b0c2a to rvc-release 

Change-Id: Ib121ebcb156c822a31c7d5d19606b16e19a8c4bf
parents 4ee4755a a44b0c2a

android/app/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);

android/app/src/com/android/bluetooth/opp/BluetoothOppHandoverReceiver.java

+2 −1
Original line number Diff line number Diff line
@@ -32,7 +32,8 @@ public class BluetoothOppHandoverReceiver extends BroadcastReceiver { 
    @Override

    public void onReceive(Context context, Intent intent) {

        String action = intent.getAction();



        if (D) Log.d(TAG, "Action :" + action);

        if (action == null) return;

        if (action.equals(Constants.ACTION_HANDOVER_SEND) || action.equals(

                Constants.ACTION_HANDOVER_SEND_MULTIPLE)) {

            final BluetoothDevice device =

android/app/src/com/android/bluetooth/opp/BluetoothOppReceiver.java

+2 −1
Original line number Diff line number Diff line
@@ -58,7 +58,8 @@ public class BluetoothOppReceiver extends BroadcastReceiver { 
    @Override

    public void onReceive(Context context, Intent intent) {

        String action = intent.getAction();



        if (D) Log.d(TAG, " action :" + action);

        if (action == null) return;

        if (action.equals(BluetoothDevicePicker.ACTION_DEVICE_SELECTED)) {

            BluetoothOppManager mOppManager = BluetoothOppManager.getInstance(context);