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

Commit e791bcaf authored by Andre Eisenbach's avatar Andre Eisenbach Committed by android-build-merger
Browse files

Merge changes from topic 'PBAP-1.2' am: 2d2af9a9 

am: 0428d621

Change-Id: Iab29151c611149b054d86bce85c8e4d4f6b8fe86
parents 3da8cd01 0428d621

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

        }

    }



    /**