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

Commit b7f70557 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 am: 02f1df53

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



Change-Id: I1ed2d1891600a1c6649b3ca596e8b47514320f78
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e6d057a2 02f1df53

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) {