Merge "SAP: Close RFCOMM connection immediately if access is denied." am: b02ffbde21 (4eacbdb6) · Commits · e / os / android_packages_apps_Bluetooth

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

+8 −3

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

	} else {		} else {
	// Assuming reject is the stored state - continue to accept new connection.		// Close RFCOMM socket for current connection and start listening
	continue;		// 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;		stopped = true; // job done ,close this thread;
	} catch (IOException ex) {		} catch (IOException ex) {
	@@ -711,7 +715,8 @@ public class SapService extends ProfileService {
	BluetoothDevice.ACCESS_ALLOWED);		BluetoothDevice.ACCESS_ALLOWED);
	if (VERBOSE) {		if (VERBOSE) {
	Log.v(TAG, "setSimAccessPermission(ACCESS_ALLOWED) result=" + result);		Log.v(TAG, "setSimAccessPermission(ACCESS_ALLOWED) result=" + result);
	} }		}
			}
	try {		try {
	if (mConnSocket != null) {		if (mConnSocket != null) {
	// start obex server and rfcomm connection		// start obex server and rfcomm connection