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

Commit 5b852e0b authored by Hemant Gupta's avatar Hemant Gupta Committed by android-build-merger
Browse files

Merge "SAP: Close RFCOMM connection immediately if access is denied." 

am: b02ffbde

Change-Id: Ifee0507c953a3466533ec4e14d47555cbdc8f160
parents 5f12709a b02ffbde

src/com/android/bluetooth/sap/SapService.java

+8 −3
Original line number Diff line number Diff line
@@ -369,8 +369,12 @@ public class SapService extends ProfileService { 
                                + sRemoteDeviceName);



                    } else {

                        // Assuming reject is the stored state - continue to accept new connection.

                        continue;

                        // Close RFCOMM socket for current connection and start listening

                        // again for new connections.

                        Log.w(TAG, "Can't connect with " + sRemoteDeviceName +

                            " as access is rejected");

                        if (mSessionStatusHandler != null)

                            mSessionStatusHandler.sendEmptyMessage(MSG_SERVERSESSION_CLOSE);

                    }

                    stopped = true; // job done ,close this thread;

                } catch (IOException ex) {
@@ -711,7 +715,8 @@ public class SapService extends ProfileService { 
                                BluetoothDevice.ACCESS_ALLOWED);

                        if (VERBOSE) {

                            Log.v(TAG, "setSimAccessPermission(ACCESS_ALLOWED) result=" + result);

                        }                    }

                        }

                    }

                    try {

                        if (mConnSocket != null) {

                            // start obex server and rfcomm connection