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

Commit 321fe1ea authored by Andrew Cheng's avatar Andrew Cheng Committed by android-build-merger
Browse files

Merge "NullPointerException handling, connectObexSession" am: 6f743f65 am:... 

Merge "NullPointerException handling, connectObexSession" am: 6f743f65 am: 2c742fbe am: 109f7133
am: 736177ea

Change-Id: I691e3c8db6bb5c7291793df26dff682cc9b905df
parents a5f20648 736177ea

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();

        }