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

Commit 2740ae20 authored by Sal Savage's avatar Sal Savage Committed by Automerger Merge Worker
Browse files

Merge "Move A2DP Sink Timeout in line with other profiles" am: 5176a146 am: e3269f7a 

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



Change-Id: Ib59f8eb6c14e4b84c79b886761451fcdc748a485
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e70f839c e3269f7a

android/app/src/com/android/bluetooth/a2dpsink/A2dpSinkStateMachine.java

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ public class A2dpSinkStateMachine extends StateMachine { 
    //200->299 Events from Native

    static final int STACK_EVENT = 200;



    static final int CONNECT_TIMEOUT_MS = 5000;

    static final int CONNECT_TIMEOUT_MS = 10000;



    protected final BluetoothDevice mDevice;

    protected final byte[] mDeviceAddress;

android/app/tests/unit/src/com/android/bluetooth/a2dpsink/A2dpSinkStateMachineTest.java

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ public class A2dpSinkStateMachineTest { 


    A2dpSinkStateMachine mStateMachine;

    private static final int TIMEOUT_MS = 1000;

    private static final int CONNECT_TIMEOUT_MS = 6000;

    private static final int CONNECT_TIMEOUT_MS = 11000;

    private static final int UNHANDLED_MESSAGE = 9999;



    @Before