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

Commit 2e95f4cd authored by Andre Eisenbach's avatar Andre Eisenbach Committed by Gerrit Code Review
Browse files

Merge changes from topic 'PBAP-1.2' 

* changes:
  PBAP: Implement Folder Version Counter(s)
  PBAP: Add support for PBAP 1.2
parents 63b6ca75 738dab24

android/app/src/com/android/bluetooth/ObexServerSockets.java

+5 −2
Original line number Diff line number Diff line
@@ -241,9 +241,12 @@ public class ObexServerSockets { 
     * Signal to the {@link IObexConnectionHandler} that an error have occurred.

     */

    synchronized private void onAcceptFailed() {

        Log.w(TAG,"onAcceptFailed() calling shutdown...");

        mConHandler.onAcceptFailed();

        shutdown(false);

        BluetoothAdapter mAdapter = BluetoothAdapter.getDefaultAdapter();

        if ((mAdapter != null) && (mAdapter.getState() == BluetoothAdapter.STATE_ON)) {

            Log.d(TAG, "onAcceptFailed() calling shutdown...");

            mConHandler.onAcceptFailed();

        }

    }



    /**