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

Commit 5094dd1a authored by Michal Belusiak's avatar Michal Belusiak Committed by Automerger Merge Worker
Browse files

Merge "ActiveDeviceManagerTest: Dispatch tasks before verify" into main am: 9d6d0842 

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



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

android/app/src/com/android/bluetooth/btservice/ActiveDeviceManager.java

+9 −1
Original line number Diff line number Diff line
@@ -160,6 +160,9 @@ public class ActiveDeviceManager implements AdapterService.BluetoothStateCallbac 
    private BluetoothDevice mClassicDeviceToBeActivated = null;

    private BluetoothDevice mClassicDeviceNotToBeActivated = null;



    // Timeout for state machine thread join, to prevent potential ANR.

    private static final int SM_THREAD_JOIN_TIMEOUT_MS = 1000;



    @Override

    public void onBluetoothStateChange(int prevState, int newState) {

        mHandler.post(() -> handleAdapterStateChanged(newState));
@@ -849,7 +852,12 @@ public class ActiveDeviceManager implements AdapterService.BluetoothStateCallbac 
        mAudioManager.unregisterAudioDeviceCallback(mAudioManagerAudioDeviceCallback);

        mAdapterService.unregisterBluetoothStateCallback(this);

        if (mHandlerThread != null) {

            mHandlerThread.quit();

            mHandlerThread.quitSafely();

            try {

                mHandlerThread.join(SM_THREAD_JOIN_TIMEOUT_MS);

            } catch (InterruptedException e) {

                // Do not rethrow as we are shutting down anyway

            }

            mHandlerThread = null;

        }

        resetState();

android/app/tests/unit/src/com/android/bluetooth/btservice/ActiveDeviceManagerTest.java

+272 −210

File changed.

Preview size limit exceeded, changes collapsed.