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

Commit 58ced168 authored by Allen-CT Chu's avatar Allen-CT Chu Committed by Myles Watson
Browse files

Correct spec_idx in bta_dm_pm_cfg 

After adding separate sniff mode settings for gamepads,
all the spec_idxes in bta_dm_pm_cfg larger than 6 are
not shifted by 1.
Correct the spec_idx to use the right bta_dm_pm_spec.

Fixes: 134444864
Test: Send data through OPP, data should be large enough
      to send over 30s.
      Before this fix, when we send data through OPP,
      it will enter sniff mode after 30s because of
      using the wrong spec_idx.
      After this fix, it will not enter sniff mode.

Change-Id: I9dcd3e8b075b35fa09a08e32cc8ff1522b8cd6ca
parent eb0c730c

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] = {