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

Commit 49ba59f8 authored by Pavlin Radoslavov's avatar Pavlin Radoslavov Committed by android-build-merger
Browse files

Merge "Add a missing check for null pointer during closing of PBAP Service" into oc-dev 

am: 204c26d0

Change-Id: I9ac185faf00cbc0e6485323e7ceaab707d956462
parents afaf8451 204c26d0

android/app/src/com/android/bluetooth/pbap/BluetoothPbapService.java

+1 −1
Original line number Diff line number Diff line
@@ -505,7 +505,7 @@ public class BluetoothPbapService extends ProfileService implements IObexConnect 


        // Last obex transaction is finished, we start to listen for incoming

        // connection again

        if (mAdapter.isEnabled()) {

        if (mAdapter != null && mAdapter.isEnabled()) {

            startSocketListeners();

        }

        setState(BluetoothPbap.STATE_DISCONNECTED);