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

Commit 02f1df53 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Prevent GattService modifying transitionalScanHelper lifecycle when not... 

Merge "Prevent GattService modifying transitionalScanHelper lifecycle when not in control if the flag is on." into main am: d57519d2

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



Change-Id: I31bae9e5c89183c22ac2482a1f07bd674aae907c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9f4b5495 d57519d2

android/app/src/com/android/bluetooth/gatt/GattService.java

+7 −5
Original line number Diff line number Diff line
@@ -241,12 +241,11 @@ public class GattService extends ProfileService { 
            Log.w(TAG, "stop() called before start()");

            return;

        }



        if (Flags.scanManagerRefactor()) {

            setGattService(null);

        }



        } else {

            mTransitionalScanHelper.stop();

        }

        mAdvertiserMap.clear();

        mClientMap.clear();

        if (Flags.gattCleanupRestrictedHandles()) {
@@ -271,8 +270,10 @@ public class GattService extends ProfileService { 
        if (mDistanceMeasurementManager != null) {

            mDistanceMeasurementManager.cleanup();

        }

        if (!Flags.scanManagerRefactor()) {

            mTransitionalScanHelper.cleanup();

        }

    }



    /** This is only used when Flags.scanManagerRefactor() is true. */

    public static synchronized GattService getGattService() {
@@ -306,7 +307,8 @@ public class GattService extends ProfileService { 
                        new Handler(getMainLooper()) {

                            public void handleMessage(Message msg) {

                                synchronized (mTestModeLock) {

                                    if (!GattService.this.isTestModeEnabled()) {

                                    if (!GattService.this.isTestModeEnabled()

                                            || Flags.scanManagerRefactor()) {

                                        return;

                                    }

                                    for (String test : TEST_MODE_BEACONS) {