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

Commit 3180a4d3 authored by Hansong Zhang's avatar Hansong Zhang Committed by android-build-merger
Browse files

Merge "PBAP: Fix NullPointerException in stop()" am: 10a216eb 

am: f602eea1

Change-Id: Ia285cc1f91af77fe75bc4fe21b6c365dc1439c23
parents b66aa91a f602eea1

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

+6 −2
Original line number Diff line number Diff line
@@ -541,8 +541,12 @@ public class BluetoothPbapService extends ProfileService implements IObexConnect 
        if (VERBOSE) {

            Log.v(TAG, "stop()");

        }

        if (mSessionStatusHandler != null) {

            mSessionStatusHandler.obtainMessage(SHUTDOWN).sendToTarget();

        }

        if (mHandlerThread != null) {

            mHandlerThread.quitSafely();

        }

        if (mContactChangeObserver == null) {

            Log.i(TAG, "Avoid unregister when receiver it is not registered");

            return true;