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

Commit 9a89f5aa authored by Joseph Pirozzo's avatar Joseph Pirozzo
Browse files

PBAPClient socket synchronization 

Synchronize connectSocket and closeSocket to ensure that the mSocket
object is not changed from another scope.

Bug: 112545225
Test: runtest bluetooth -c com.android.bluetooth.pbapclient.PbapClientServiceTest
Change-Id: I74905ee2c5c72c8336f86df5b9421a56175cb057
parent 22371f9b

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) {