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

Commit 572ea3b7 authored by Joseph Pirozzo's avatar Joseph Pirozzo Committed by android-build-merger
Browse files

Merge changes Ife707d80,I74905ee2 am: ba110c1f 

am: 40467d69

Change-Id: I1764babbc8561b8bd448e6aca505c9e8d690caaf
parents 9d1d42ae 40467d69

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

+1 −0
Original line number Diff line number Diff line
@@ -729,6 +729,7 @@ class AvrcpControllerStateMachine extends StateMachine { 
    }



    void dump(StringBuilder sb) {

        if (mRemoteDevice == null) return;

        BluetoothDevice device = mRemoteDevice.mBTDevice;

        if (device == null) return;

        ProfileService.println(sb, "mCurrentDevice: " + device.getAddress() + "("

android/app/src/com/android/bluetooth/pbapclient/PbapClientConnectionHandler.java

+2 −2
Original line number Diff line number Diff line
@@ -273,7 +273,7 @@ class PbapClientConnectionHandler extends Handler { 


    /* Utilize SDP, if available, to create a socket connection over L2CAP, RFCOMM specified

     * channel, or RFCOMM default channel. */

    private boolean connectSocket() {

    private synchronized boolean connectSocket() {

        try {

            /* Use BluetoothSocket to connect */

            if (mPseRec == null) {
@@ -352,7 +352,7 @@ class PbapClientConnectionHandler extends Handler { 
        this.getLooper().getThread().interrupt();

    }



    private void closeSocket() {

    private synchronized void closeSocket() {

        try {

            if (mSocket != null) {

                if (DBG) {