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

Commit 64e1c0c2 authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

Merge changes I14572835,Ib445933a,I842b69db,I2b8eeb2c,Iaf263d45, ... am:... 

Merge changes I14572835,Ib445933a,I842b69db,I2b8eeb2c,Iaf263d45, ... am: 32107ef8 am: f788e4ed am: 1a22295e

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1559735

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I93060940fe2962f52da8a3ce9da9eb3e49db3033
parents 2ad065a9 1a22295e

system/bta/ag/bta_ag_at.h

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#ifndef BTA_AG_AT_H

#define BTA_AG_AT_H



#include <cstddef>

#include <cstdint>



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

system/bta/ag/bta_ag_int.h

+4 −4
Original line number Diff line number Diff line
@@ -26,10 +26,10 @@ 


#include <cstdint>



#include "bta_ag_api.h"

#include "bta_ag_at.h"

#include "bta_api.h"

#include "bta_sys.h"

#include "bta/ag/bta_ag_at.h"

#include "bta/include/bta_ag_api.h"

#include "bta/include/bta_api.h"

#include "bta/sys/bta_sys.h"



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

 *  Constants

system/bta/ag/bta_ag_main.cc

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
#include "main/shim/dumpsys.h"

#include "osi/include/log.h"

#include "osi/include/osi.h"

#include "stack/include/btm_api.h"

#include "utl.h"



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

system/bta/ar/bta_ar.cc

+2 −0
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ 


#include "bta_ar_api.h"

#include "bta_ar_int.h"

#include "stack/include/avct_api.h"

#include "stack/include/avrc_api.h"



/* AV control block */

tBTA_AR_CB bta_ar_cb;

system/bta/ar/bta_ar_int.h

+4 −1
Original line number Diff line number Diff line
@@ -25,7 +25,10 @@ 
#ifndef BTA_AR_INT_H

#define BTA_AR_INT_H



#include "bta_av_api.h"

#include <cstdint>



#include "bta/include/bta_av_api.h"

#include "stack/include/avdt_api.h"



#define BTA_AR_AV_MASK 0x01

#define BTA_AR_AVK_MASK 0x02