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

Commit fb67388e authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 4736748 from 242d5f50 to pi-release 

Change-Id: If734f4661ba1ce584f4dec02170e194f77b4778e
parents 131f37da 242d5f50

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

+7 −3
Original line number Diff line number Diff line
@@ -62,8 +62,10 @@ class AdapterProperties { 
            "persist.bluetooth.maxconnectedaudiodevices";

    static final int MAX_CONNECTED_AUDIO_DEVICES_LOWER_BOND = 1;

    private static final int MAX_CONNECTED_AUDIO_DEVICES_UPPER_BOUND = 5;

    private static final String A2DP_OFFLOAD_ENABLE_PROPERTY =

            "persist.bluetooth.a2dp_offload.enable";

    private static final String A2DP_OFFLOAD_SUPPORTED_PROPERTY =

            "ro.bluetooth.a2dp_offload.supported";

    private static final String A2DP_OFFLOAD_DISABLED_PROPERTY =

            "persist.bluetooth.a2dp_offload.disabled";



    private static final long DEFAULT_DISCOVERY_TIMEOUT_MS = 12800;

    private static final int BD_ADDR_LEN = 6; // in bytes
@@ -193,7 +195,9 @@ class AdapterProperties { 
                + propertyOverlayedMaxConnectedAudioDevices + ", finalValue="

                + mMaxConnectedAudioDevices);



        mA2dpOffloadEnabled = SystemProperties.getBoolean(A2DP_OFFLOAD_ENABLE_PROPERTY, false);

        mA2dpOffloadEnabled =

                SystemProperties.getBoolean(A2DP_OFFLOAD_SUPPORTED_PROPERTY, false)

                && !SystemProperties.getBoolean(A2DP_OFFLOAD_DISABLED_PROPERTY, false);



        IntentFilter filter = new IntentFilter();

        filter.addAction(BluetoothHeadset.ACTION_CONNECTION_STATE_CHANGED);

android/app/tests/unit/src/com/android/bluetooth/a2dp/A2dpServiceTest.java

+0 −3
Original line number Diff line number Diff line
@@ -610,13 +610,10 @@ public class A2dpServiceTest { 
        Assert.assertTrue(mA2dpService.getDevices().contains(mTestDevice));



        // A2DP stack event: EVENT_TYPE_CODEC_CONFIG_CHANGED - Intent broadcast should be generated

        // TODO: Commented-out for now because of b/73404858

/*

        generateCodecMessageFromNative(mTestDevice, codecStatus);

        Assert.assertEquals(BluetoothProfile.STATE_CONNECTED,

                            mA2dpService.getConnectionState(mTestDevice));

        Assert.assertTrue(mA2dpService.getDevices().contains(mTestDevice));

*/



        // A2DP stack event: CONNECTION_STATE_DISCONNECTED - state machine should be removed

        generateConnectionMessageFromNative(mTestDevice, BluetoothProfile.STATE_DISCONNECTED,