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

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

Snap for 5876588 from 9646601f to rvc-release 

Change-Id: I271520e7325a1879dd9346910c6fabe705832b92
parents d8dbf25b 9646601f

system/bta/dm/bta_dm_cfg.cc

+15 −15
Original line number Diff line number Diff line
@@ -130,9 +130,9 @@ tBTA_DM_PM_TYPE_QUALIFIER tBTA_DM_PM_CFG 
        {BTA_ID_CG, BTA_ALL_APP_ID, 1},     /* cg resue ct spec table */

        {BTA_ID_DG, BTA_ALL_APP_ID, 2},     /* dg spec table */

        {BTA_ID_AV, BTA_ALL_APP_ID, 4},     /* av spec table */

        {BTA_ID_AVK, BTA_ALL_APP_ID, 12},   /* avk spec table */

        {BTA_ID_FTC, BTA_ALL_APP_ID, 6},    /* ftc spec table */

        {BTA_ID_FTS, BTA_ALL_APP_ID, 7},    /* fts spec table */

        {BTA_ID_AVK, BTA_ALL_APP_ID, 13},   /* avk spec table */

        {BTA_ID_FTC, BTA_ALL_APP_ID, 7},    /* ftc spec table */

        {BTA_ID_FTS, BTA_ALL_APP_ID, 8},    /* fts spec table */

        {BTA_ID_HD, BTA_ALL_APP_ID, 3},     /* hd spec table */

        {BTA_ID_HH, BTA_HH_APP_ID_JOY, 5},  /* app BTA_HH_APP_ID_JOY,

                                               similar to hh spec table */
@@ -140,19 +140,19 @@ tBTA_DM_PM_TYPE_QUALIFIER tBTA_DM_PM_CFG 
                                               similar to hh spec table */

        {BTA_ID_HH, BTA_ALL_APP_ID, 6},     /* hh spec table */

        {BTA_ID_PBC, BTA_ALL_APP_ID, 2},    /* reuse dg spec table */

        {BTA_ID_PBS, BTA_ALL_APP_ID, 7},    /* reuse fts spec table */

        {BTA_ID_OPC, BTA_ALL_APP_ID, 6},    /* reuse ftc spec table */

        {BTA_ID_OPS, BTA_ALL_APP_ID, 7},    /* reuse fts spec table */

        {BTA_ID_MSE, BTA_ALL_APP_ID, 7},    /* reuse fts spec table */

        {BTA_ID_PBS, BTA_ALL_APP_ID, 8},    /* reuse fts spec table */

        {BTA_ID_OPC, BTA_ALL_APP_ID, 7},    /* reuse ftc spec table */

        {BTA_ID_OPS, BTA_ALL_APP_ID, 8},    /* reuse fts spec table */

        {BTA_ID_MSE, BTA_ALL_APP_ID, 8},    /* reuse fts spec table */

        {BTA_ID_JV, BTA_JV_PM_ID_1,

         6}, /* app BTA_JV_PM_ID_1, reuse ftc spec table */

        {BTA_ID_JV, BTA_ALL_APP_ID, 7},     /* reuse fts spec table */

        {BTA_ID_HL, BTA_ALL_APP_ID, 8},     /* reuse fts spec table */

        {BTA_ID_PAN, BTUI_PAN_ID_PANU, 9},  /* PANU spec table */

        {BTA_ID_PAN, BTUI_PAN_ID_NAP, 10},  /* NAP spec table */

        {BTA_ID_HS, BTA_ALL_APP_ID, 11},    /* HS spec table */

        {BTA_ID_GATTC, BTA_ALL_APP_ID, 13}, /* gattc spec table */

        {BTA_ID_GATTS, BTA_ALL_APP_ID, 14}  /* gatts spec table */

         7}, /* app BTA_JV_PM_ID_1, reuse ftc spec table */

        {BTA_ID_JV, BTA_ALL_APP_ID, 8},     /* reuse fts spec table */

        {BTA_ID_HL, BTA_ALL_APP_ID, 9},     /* reuse fts spec table */

        {BTA_ID_PAN, BTUI_PAN_ID_PANU, 10}, /* PANU spec table */

        {BTA_ID_PAN, BTUI_PAN_ID_NAP, 11},  /* NAP spec table */

        {BTA_ID_HS, BTA_ALL_APP_ID, 12},    /* HS spec table */

        {BTA_ID_GATTC, BTA_ALL_APP_ID, 14}, /* gattc spec table */

        {BTA_ID_GATTS, BTA_ALL_APP_ID, 15}  /* gatts spec table */

};



tBTA_DM_PM_TYPE_QUALIFIER tBTA_DM_PM_SPEC bta_dm_pm_spec[BTA_DM_NUM_PM_SPEC] = {

system/gd/cert/gd_cert_device.py

+2 −0
Original line number Diff line number Diff line
@@ -79,3 +79,5 @@ class GdCertDevice(GdDeviceBase): 
        self.hci.disconnection_stream = EventStream(self.hci.FetchDisconnection)

        self.hci.connection_failed_stream = EventStream(self.hci.FetchConnectionFailed)

        self.hci.acl_stream = EventStream(self.hci.FetchAclData)

        self.l2cap.packet_stream = EventStream(self.l2cap.FetchL2capData)

        self.l2cap.connection_complete_stream = EventStream(self.l2cap.FetchConnectionComplete)

system/gd/cert/gd_device.py

+2 −0
Original line number Diff line number Diff line
@@ -81,3 +81,5 @@ class GdDevice(GdDeviceBase): 
        self.hci.connection_failed_stream = EventStream(self.hci.FetchConnectionFailed)

        self.hci.acl_stream = EventStream(self.hci.FetchAclData)

        self.hci_classic_security.command_complete_stream = EventStream(self.hci_classic_security.FetchCommandCompleteEvent)

        self.l2cap.packet_stream = EventStream(self.l2cap.FetchL2capData)

        self.l2cap.connection_complete_stream = EventStream(self.l2cap.FetchConnectionComplete)

system/gd/hal/hci_hal_android_hidl.cc

+1 −0
Original line number Diff line number Diff line
@@ -113,6 +113,7 @@ class InternalHciCallbacks : public IBluetoothHciCallbacks { 
}  // namespace



const std::string SnoopLogger::DefaultFilePath = "/data/misc/bluetooth/logs/btsnoop_hci.log";

const bool SnoopLogger::AlwaysFlush = false;



class HciHalHidl : public HciHal {

 public:

system/gd/hal/hci_hal_host_rootcanal.cc

+1 −0
Original line number Diff line number Diff line
@@ -87,6 +87,7 @@ namespace bluetooth { 
namespace hal {



const std::string SnoopLogger::DefaultFilePath = "/tmp/btsnoop_hci.log";

const bool SnoopLogger::AlwaysFlush = true;



class HciHalHostRootcanal : public HciHal {

 public: