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

Commit ac72fb09 authored by Sal Savage's avatar Sal Savage Committed by android-build-merger
Browse files

Merge "Use StateMachine.sendMessage() to avoid NPEs on state machine quit" am:... 

Merge "Use StateMachine.sendMessage() to avoid NPEs on state machine quit" am: 39aec906 am: f05e11cf
am: 3477a5f1

Change-Id: Iffcf5b44d32a93fa7dfcf7cba96d6e7bbc514bd0
parents 8970e72d 3477a5f1

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

+7 −8
Original line number Diff line number Diff line
@@ -195,17 +195,17 @@ class PbapClientConnectionHandler extends Handler { 
                    }

                } else {

                    Log.w(TAG, "Socket CONNECT Failure ");

                    mPbapClientStateMachine.obtainMessage(

                            PbapClientStateMachine.MSG_CONNECTION_FAILED).sendToTarget();

                    mPbapClientStateMachine.sendMessage(

                            PbapClientStateMachine.MSG_CONNECTION_FAILED);

                    return;

                }



                if (connectObexSession()) {

                    mPbapClientStateMachine.obtainMessage(

                            PbapClientStateMachine.MSG_CONNECTION_COMPLETE).sendToTarget();

                    mPbapClientStateMachine.sendMessage(

                            PbapClientStateMachine.MSG_CONNECTION_COMPLETE);

                } else {

                    mPbapClientStateMachine.obtainMessage(

                            PbapClientStateMachine.MSG_CONNECTION_FAILED).sendToTarget();

                    mPbapClientStateMachine.sendMessage(

                            PbapClientStateMachine.MSG_CONNECTION_FAILED);

                }

                break;
@@ -235,8 +235,7 @@ class PbapClientConnectionHandler extends Handler { 
                removeAccount(mAccount);

                removeCallLog(mAccount);



                mPbapClientStateMachine.obtainMessage(PbapClientStateMachine.MSG_CONNECTION_CLOSED)

                    .sendToTarget();

                mPbapClientStateMachine.sendMessage(PbapClientStateMachine.MSG_CONNECTION_CLOSED);

                break;



            case MSG_DOWNLOAD: