Merge "NullPointerException handling, connectObexSession" am: 6f743f654f (109f7133) · Commits · e / os / android_packages_modules_Bluetooth

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

+4 −1

Original line number	Diff line number	Diff line
		@@ -329,7 +329,10 @@ class PbapClientConnectionHandler extends Handler {
		if (DBG) {
		Log.d(TAG, "Success = " + Boolean.toString(connectionSuccessful));
		}
		} catch (IOException e) {
		} catch (IOException \| NullPointerException e) {
		// Will get NPE if a null mSocket is passed to BluetoothObexTransport.
		// mSocket can be set to null if an abort() --> closeSocket() was called between
		// the calls to connectSocket() and connectObexSession().
		Log.w(TAG, "CONNECT Failure " + e.toString());
		closeSocket();
		}