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

Commit 614e6530 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Guard mPbapStateMachineMap" am: eef4e0e7 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2627867



Change-Id: Ie416b988de6d77de71be7e946df706ce6464b349
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b70ace90 eef4e0e7

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

+3 −1
Original line number Diff line number Diff line
@@ -725,7 +725,9 @@ public class BluetoothPbapService extends ProfileService implements IObexConnect 
        getContentResolver().unregisterContentObserver(mContactChangeObserver);

        mContactChangeObserver = null;

        setComponentAvailable(PBAP_ACTIVITY, false);

        synchronized (mPbapStateMachineMap) {

            mPbapStateMachineMap.clear();

        }

        return true;

    }