Merge "Ensure BluetoothSocket closed even when exception happens" (d163ac53) · Commits · e / os / android_packages_modules_Bluetooth

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -229,13 +229,13 @@ class PbapClientConnectionHandler extends Handler {
		mObexSession.disconnect(null);
		mObexSession.close();
		}

		} catch (IOException e) {
		Log.w(TAG, "DISCONNECT Failure ", e);
		} finally {
		if (DBG) {
		Log.d(TAG, "Closing Socket");
		}
		closeSocket();
		} catch (IOException e) {
		Log.w(TAG, "DISCONNECT Failure ", e);
		}
		if (DBG) {
		Log.d(TAG, "Completing Disconnect");