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

Commit 52f417ef authored by Jack He's avatar Jack He Committed by Automerger Merge Worker
Browse files

Merge "LE Audio: close GATT server properly" into tm-qpr-dev am: ceb25ac1 

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



Change-Id: I84e02b3e92877c9a76c68d69dbd7ae86a71d3f8a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 78d8f8de ceb25ac1

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

+8 −2
Original line number Diff line number Diff line
@@ -1387,12 +1387,18 @@ public class MediaControlGattService implements MediaControlGattServiceInterface 
        if (DBG) {

            Log.d(TAG, "Destroy");

        }

        if (mBluetoothGattServer != null

                && mBluetoothGattServer.removeService(mGattService)) {



        if (mBluetoothGattServer == null) {

            return;

        }



        if (mBluetoothGattServer.removeService(mGattService)) {

            if (mCallbacks != null) {

                mCallbacks.onServiceInstanceUnregistered(ServiceStatus.OK);

            }

        }



        mBluetoothGattServer.close();

    }



    @VisibleForTesting