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

Commit eba08a58 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 7490979 from a1d0f75d to sc-release 

Change-Id: I8177f078b99e5dee9e729f4afd1da7ada1f1dea0
parents b3d95008 a1d0f75d

system/bta/av/bta_av_aact.cc

+2 −2
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ static const uint16_t bta_av_stream_evt_ok[] = { 
    BTA_AV_AVDT_RPT_CONN_EVT, /* AVDT_REPORT_CONN_EVT */

    BTA_AV_AVDT_RPT_CONN_EVT, /* AVDT_REPORT_DISCONN_EVT */

    BTA_AV_AVDT_DELAY_RPT_EVT, /* AVDT_DELAY_REPORT_EVT */

    0                          /* AVDT_DELAY_REPORT_CFM_EVT */

    BTA_AV_AVDT_DELAY_RPT_CFM_EVT, /* AVDT_DELAY_REPORT_CFM_EVT */

};



static const uint16_t bta_av_stream_evt_fail[] = {
@@ -157,7 +157,7 @@ static const uint16_t bta_av_stream_evt_fail[] = { 
    BTA_AV_AVDT_RPT_CONN_EVT, /* AVDT_REPORT_CONN_EVT */

    BTA_AV_AVDT_RPT_CONN_EVT, /* AVDT_REPORT_DISCONN_EVT */

    BTA_AV_AVDT_DELAY_RPT_EVT, /* AVDT_DELAY_REPORT_EVT */

    0                          /* AVDT_DELAY_REPORT_CFM_EVT */

    BTA_AV_AVDT_DELAY_RPT_CFM_EVT, /* AVDT_DELAY_REPORT_CFM_EVT */

};



/***********************************************

system/bta/av/bta_av_int.h

+1 −0
Original line number Diff line number Diff line
@@ -90,6 +90,7 @@ enum { 
  BTA_AV_AVDT_DISCONNECT_EVT,

  BTA_AV_ROLE_CHANGE_EVT,

  BTA_AV_AVDT_DELAY_RPT_EVT,

  BTA_AV_AVDT_DELAY_RPT_CFM_EVT,

  BTA_AV_ACP_CONNECT_EVT,

  BTA_AV_API_OFFLOAD_START_EVT,

  BTA_AV_API_OFFLOAD_START_RSP_EVT,

system/btif/src/btif_av.cc

+5 −0
Original line number Diff line number Diff line
@@ -3231,6 +3231,11 @@ bt_status_t btif_av_sink_execute_service(bool enable) { 
                            BTA_AV_FEAT_METADATA | BTA_AV_FEAT_VENDOR |

                            BTA_AV_FEAT_ADV_CTRL | BTA_AV_FEAT_RCTG |

                            BTA_AV_FEAT_BROWSE | BTA_AV_FEAT_COVER_ARTWORK;



    if (delay_reporting_enabled()) {

      features |= BTA_AV_FEAT_DELAY_RPT;

    }



    BTA_AvEnable(features, bta_av_sink_callback);

    btif_av_sink.RegisterAllBtaHandles();

    return BT_STATUS_SUCCESS;

system/internal_include/bt_target.h

+5 −0
Original line number Diff line number Diff line
@@ -826,6 +826,11 @@ 
#define AVDT_PROTECT_SIZE 90

#endif



/* Default sink delay value in ms. */

#ifndef AVDT_SINK_DELAY_MS

#define AVDT_SINK_DELAY_MS 300

#endif



/******************************************************************************

 *

 * PAN

system/stack/Android.bp

+50 −0
Original line number Diff line number Diff line
@@ -507,6 +507,56 @@ cc_test { 
    },

}



cc_test {

    name: "net_test_stack_avdtp",

    defaults: ["fluoride_defaults"],

    test_suites: ["device-tests"],

    host_supported: true,

    test_options: {

        unit_test: true,

    },

    include_dirs: [

        "external/libldac/inc",

        "packages/modules/Bluetooth/system",

        "packages/modules/Bluetooth/system/stack/include",

        "packages/modules/Bluetooth/system/utils/include",

    ],

    srcs: [

        "test/stack_avdtp_test.cc",

        "avdt/avdt_ad.cc",

        "avdt/avdt_api.cc",

        "avdt/avdt_ccb.cc",

        "avdt/avdt_ccb_act.cc",

        "avdt/avdt_l2c.cc",

        "avdt/avdt_scb.cc",

        "avdt/avdt_scb_act.cc",

        "test/common/mock_btu_layer.cc",

        "test/common/mock_stack_avdt_msg.cc",

        ":TestMockStackL2cap",

        ":TestMockStackAcl",

        ":TestMockStackA2dp",

        ":TestMockBta",

        ":TestMockDevice",

    ],

    shared_libs: [

        "libcrypto",

        "libcutils",

        "libprotobuf-cpp-lite",

    ],

    static_libs: [

        "libbt-common",

        "libbt-protos-lite",

        "liblog",

        "libosi",

        "libosi-AllocationTestHarness",

    ],

    sanitize: {

        address: true,

        cfi: true,

        misc_undefined: ["bounds"],

    },

}



cc_test {

    name: "net_test_stack_a2dp_native",

    defaults: ["fluoride_defaults"],