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

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

Snap for 7095583 from d8ed94c5 to sc-release 

Change-Id: I49460c3ad968858408e38b48ccb687296bad33a9
parents 2123089a d8ed94c5

system/binder/android/bluetooth/BufferConstraints.aidl

0 → 100644
+3 −0
Original line number Diff line number Diff line 
package android.bluetooth;



parcelable BufferConstraints;

system/binder/android/bluetooth/IBluetoothA2dp.aidl

+4 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package android.bluetooth; 
import android.bluetooth.BluetoothCodecConfig;

import android.bluetooth.BluetoothCodecStatus;

import android.bluetooth.BluetoothDevice;

import android.bluetooth.BufferConstraints;



/**

 * APIs for Bluetooth A2DP service
@@ -52,5 +53,8 @@ interface IBluetoothA2dp { 
    int supportsOptionalCodecs(in BluetoothDevice device);

    int getOptionalCodecsEnabled(in BluetoothDevice device);

    oneway void setOptionalCodecsEnabled(in BluetoothDevice device, int value);

    int getDynamicBufferSupport();

    BufferConstraints getBufferConstraints();

    boolean setBufferMillis(int codec, int size);

    int getPriority(in BluetoothDevice device);

}

system/bta/dm/bta_dm_act.cc

+0 −1
Original line number Diff line number Diff line
@@ -326,7 +326,6 @@ void BTA_dm_on_hw_on() { 
    get_btm_client_interface().security.BTM_SecRegister(&bta_security);

  }



  BTM_SetDefaultLinkSuperTout(p_bta_dm_cfg->link_timeout);

  BTM_WritePageTimeout(p_bta_dm_cfg->page_timeout);



#if (BLE_VND_INCLUDED == TRUE)

system/bta/dm/bta_dm_cfg.cc

+0 −7
Original line number Diff line number Diff line
@@ -37,11 +37,6 @@ 
#define BTA_DM_PAGE_TIMEOUT 8192

#endif



/* link supervision timeout in 625uS (5 secs) */

#ifndef BTA_DM_LINK_TIMEOUT

#define BTA_DM_LINK_TIMEOUT 8000

#endif



/* TRUE to avoid scatternet when av is streaming (be the central) */

#ifndef BTA_DM_AVOID_SCATTER_A2DP

#define BTA_DM_AVOID_SCATTER_A2DP TRUE
@@ -60,8 +55,6 @@ const tBTA_DM_CFG bta_dm_cfg = { 
    BTA_DM_COD,

    /* page timeout in 625uS */

    BTA_DM_PAGE_TIMEOUT,

    /* link supervision timeout in 625uS*/

    BTA_DM_LINK_TIMEOUT,

    /* true to avoid scatternet when av is streaming (be the central) */

    BTA_DM_AVOID_SCATTER_A2DP};

system/bta/dm/bta_dm_int.h

+0 −1
Original line number Diff line number Diff line
@@ -395,7 +395,6 @@ enum { 
typedef struct {

  DEV_CLASS dev_class; /* local device class */

  uint16_t page_timeout; /* timeout for page in slots */

  uint16_t link_timeout; /* link supervision timeout in slots */

  bool avoid_scatter; /* true to avoid scatternet when av is streaming (be the

                         central) */