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

Commit bfaa398e authored by Kihong Seong's avatar Kihong Seong Committed by Automerger Merge Worker
Browse files

Merge "Merge constructor and start in multiple managers" into main am: 791d8705 

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



Change-Id: Ibe96090a5733517ba4d19207ee6f84479ffc0d61
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5cd340f7 791d8705

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

+1 −5
Original line number Diff line number Diff line
@@ -71,12 +71,8 @@ public class AdvertiseManager { 
        mNativeInterface = nativeInterface;

        mAdapterService = adapterService;

        mAdvertiserMap = advertiserMap;

    }



    /**

     * Start a {@link HandlerThread} that handles advertising operations.

     */

    void start() {

        // Start a HandlerThread that handles advertising operations

        mNativeInterface.init(this);

        HandlerThread thread = new HandlerThread("BluetoothAdvertiseManager");

        thread.start();

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

+1 −5
Original line number Diff line number Diff line
@@ -59,12 +59,8 @@ public class DistanceMeasurementManager { 
     */

    DistanceMeasurementManager(AdapterService adapterService) {

        mAdapterService = adapterService;

    }



    /**

     * Start a {@link HandlerThread} that handles distnace measurement operations.

     */

    void start() {

        // Start a HandlerThread that handles distance measurement operations

        mHandlerThread = new HandlerThread("DistanceMeasurementManager");

        mHandlerThread.start();

        mDistanceMeasurementNativeInterface = DistanceMeasurementNativeInterface.getInstance();

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

+0 −3
Original line number Diff line number Diff line
@@ -355,18 +355,15 @@ public class GattService extends ProfileService { 
                        AdvertiseManagerNativeInterface.getInstance(),

                        mAdapterService,

                        mAdvertiserMap);

        mAdvertiseManager.start();



        mScanManager = GattObjectsFactory.getInstance()

                .createScanManager(this, mAdapterService, mBluetoothAdapterProxy);



        mPeriodicScanManager = GattObjectsFactory.getInstance()

                .createPeriodicScanManager(mAdapterService);

        mPeriodicScanManager.start();



        mDistanceMeasurementManager = GattObjectsFactory.getInstance()

                .createDistanceMeasurementManager(mAdapterService);

        mDistanceMeasurementManager.start();



        mActivityManager = getSystemService(ActivityManager.class);

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

+2 −7
Original line number Diff line number Diff line
@@ -52,18 +52,13 @@ public class PeriodicScanManager { 
    static int sTempRegistrationId = -1;

    private static final int PA_SOURCE_LOCAL = 1;

    private static final int PA_SOURCE_REMOTE = 2;

    /**

     * Constructor of {@link SyncManager}.

     */

    /** Constructor of {@link PeriodicScanManager}. */

    PeriodicScanManager(AdapterService adapterService) {

        if (DBG) {

            Log.d(TAG, "advertise manager created");

            Log.d(TAG, "periodic scan manager created");

        }

        mAdapter = BluetoothAdapter.getDefaultAdapter();

        mNativeInterface = PeriodicScanNativeInterface.getInstance();

    }



    void start() {

        mNativeInterface.init(this);

    }

android/app/tests/unit/src/com/android/bluetooth/gatt/DistanceMeasurementManagerTest.java

+0 −1
Original line number Diff line number Diff line
@@ -69,7 +69,6 @@ public class DistanceMeasurementManagerTest { 
        doReturn(IDENTITY_ADDRESS).when(mAdapterService).getIdentityAddress(IDENTITY_ADDRESS);

        DistanceMeasurementNativeInterface.setInstance(mDistanceMeasurementNativeInterface);

        mDistanceMeasurementManager = new DistanceMeasurementManager(mAdapterService);

        mDistanceMeasurementManager.start();

        mUuid = UUID.randomUUID();

        mDevice = BluetoothAdapter.getDefaultAdapter().getRemoteDevice(IDENTITY_ADDRESS);

    }