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

Commit 6f743f65 authored by Andrew Cheng's avatar Andrew Cheng Committed by Gerrit Code Review
Browse files

Merge "NullPointerException handling, connectObexSession"

parents b59c1a9f 8e7766f3
Loading
Loading
Loading
Loading
+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();
        }