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

Commit db47f36c authored by Jakub Pawłowski's avatar Jakub Pawłowski Committed by Automerger Merge Worker
Browse files

Merge "TbsGatt and MCS: unregister adapter state listener to prevent crash"... 

Merge "TbsGatt and MCS: unregister adapter state listener to prevent crash" into main am: 89cd993a

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



Change-Id: I9e7f96fe8eec26a89619ee11fdee19ccb1a13350
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 02b522e9 89cd993a

android/app/src/com/android/bluetooth/mcp/MediaControlGattService.java

+2 −0
Original line number Diff line number Diff line
@@ -1636,6 +1636,8 @@ public class MediaControlGattService implements MediaControlGattServiceInterface 
            Log.d(TAG, "Destroy");

        }



        mAdapterService.unregisterBluetoothStateCallback(mBluetoothStateChangeCallback);



        if (mBluetoothGattServer == null) {

            return;

        }

android/app/src/com/android/bluetooth/tbs/TbsGatt.java

+6 −2
Original line number Diff line number Diff line
@@ -254,8 +254,10 @@ public class TbsGatt { 


    TbsGatt(TbsService tbsService) {

        mContext = tbsService;

        mAdapterService =  Objects.requireNonNull(AdapterService.getAdapterService(),

                "AdapterService shouldn't be null when creating MediaControlCattService");

        mAdapterService =

                Objects.requireNonNull(

                        AdapterService.getAdapterService(),

                        "AdapterService shouldn't be null when creating TbsGatt");



        mAdapterService.registerBluetoothStateCallback(

                mContext.getMainExecutor(), mBluetoothStateChangeCallback);
@@ -363,6 +365,8 @@ public class TbsGatt { 
    }



    public void cleanup() {

        mAdapterService.unregisterBluetoothStateCallback(mBluetoothStateChangeCallback);



        if (mBluetoothGattServer == null) {

            return;

        }