History log of /system/bt/bta/dm/bta_dm_act.cc
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
e92648629c81ff1a12a605475983d0df5fc24aa3 02-May-2017 Martin Brabham <optedoblivion@google.com> bta_dm: Stop copying garbage

After we reach 7 ACL connections we have 7 peer device records.
Once we reach this then we lose a connection and shrink the list we
copy garbage into the last peer device record. This can cause the flag
remove_dev_pending to be set to something > 0 thus true which causes the
stack to remove the device and its bonding information on the next
acl change event.

ACL Connections can happen from any connection (pairing, SDP, etc...)

Bug: 36598959
Test: Manual
Change-Id: Ifbaa4098edba442274ffde183960ef53169988e7
Merged-In: Ifbaa4098edba442274ffde183960ef53169988e7
/system/bt/bta/dm/bta_dm_act.cc
ce54c403203597ba92720f52d47d57189ae37de6 25-May-2017 Jakub Pawlowski <jpawlowski@google.com> Fix GATT Server disconnecting for no reason

Connections created by GAP profile should be ephemeral, and not
interfere with the connection timeout.

When a device is bonded, listing services through DM would cause a
DM APP to create a connection, and later to disconnect. This causes
connection to timeout. In case a device was already connected, this
should not happen.

Bug: 34951749
Test: manual
Change-Id: Iad04fd9eed4c664f35131442e3f83a704497a067
(cherry picked from commit 16bb48b320cde54a1a06a525f4d9be1421689649)
/system/bt/bta/dm/bta_dm_act.cc
a43e1304c2cbca16d583e08b63cb4c95a37b7b87 08-May-2017 Jack He <siyuanh@google.com> eSCO: Format changes to original vendor patch (4/5)

* Format changes to original vendor patch
* Re-order part of SCO creation code to improve readability
* Make log more concise and usefull

Bug: 19540029
Test: make, HFP PTS test, testplans/86884, testplans/87103
Change-Id: Ie0199519afb30f56568c04fef728fce44a172063
(cherry picked from commit fe695a557a92053d4c44428ba08c0b8e945d4711)
/system/bt/bta/dm/bta_dm_act.cc
4f484079fd27effce2675ed38f3cdf88da42ab04 13-Apr-2017 Andre Eisenbach <eisenbach@google.com> Do not remove device security record on LMP timeout

If an LMP timeout is encountered in the middle of authentication, the
link key is removed from the controller (but not from NVRAM). This can
result in a follow up connction triggering a LINK_KEY_MISSING reply,
which in turn can cause a remote device to initiate pairing which will
then finally remove the link key stored in NVRAM as well.

This change prevents the link key from being removed from the Bluetooth
controller in case of a timeout during link authentication.

Bug: 36798442
Test: manual
Change-Id: Ic89a16b45756e3d40b2e374c645c8f245f6ce3fc
(cherry picked from commit 1f5ec7304fc4e297f9f9868b5bd9382c2a26c8cc)
/system/bt/bta/dm/bta_dm_act.cc
7651cfbe6a2bd258eecda2764bdaa10b711d9e4f 15-Mar-2017 Alex Deymo <deymo@google.com> Fix bta_dm_act.cc compile error.

When BTM_LOCAL_IO_CAPS == BTM_IO_CAP_NONE the code fails to compile due
to a missing comma. This was introducted a couple of months ago by
2e8e9f42132d0297a94c0852a1fbf45c9bc348e5 but it went undetected.

This patch simply adds back the missing comma.

Bug: 35804180
Test: `make` on a device with BTM_LOCAL_IO_CAPS set to BTM_IO_CAP_NONE.
Change-Id: I0a924abec4fe6612c5dbb72416123ca391551523
/system/bt/bta/dm/bta_dm_act.cc
eb1ad1d47b84767d9af180243cb14ac409331a0d 01-Mar-2017 Pulkit Bhuwalka <pulkitb@google.com> Allow framework to compile with BTM_IO_CAP_NONE

Using BTM_IO_CAP_NONE currently causes compilation to fail since
bta_dm_sp_cback ends up unused out a previous #ifdef that only kicks
in if BTM_IO_CAP_NONE is not set. Plugging the entire function into
a #ifdef so consistency is maintained and the framework can compile.

Bug: 35257446
Test: Built locally and run on device. Pairing without display using
JustWorks works.

Change-Id: Ibd7af6454253ccd731ff79602f327a52b8fe585b
/system/bt/bta/dm/bta_dm_act.cc
f7100bb0e57ed289833c353ba06028345f9f39b6 13-Feb-2017 Jakub Pawlowski <jpawlowski@google.com> Change LE advertisement data length type (uint8_t -> uint16_t)

Chained advertisement data can be up to 1650 bytes.

Test: manual
Bug: 30622771
Change-Id: I67af5a8130ac2d3f0dbd8f5e3f28b72b152256c2
/system/bt/bta/dm/bta_dm_act.cc
0595ca0018ac9980d1dd7e192301f8494a01f9cb 07-Feb-2017 Jakub Pawlowski <jpawlowski@google.com> Advertising data handling improvements

* use non-hardcoded advertise data size
* use cache for keeping non-complete advertising data, waiting either
for scan scan response, or secondary channel data.

Bug: 30622771
Test: sl4a FilteringTest
Change-Id: I689edcb4aee30361df15340029559cd19dac552b
/system/bt/bta/dm/bta_dm_act.cc
7de0f9b78fb38fcb02cbcd3c1c7c005947b9e291 27-Jan-2017 Jakub Pawlowski <jpawlowski@google.com> Propagate BT5 specific scan result properties up the stack (2/3)

Bug: 30622771
Test: sl4a FilteringTest
Change-Id: Ib9d18ea3a1fc7d95300415a04b551d66767b04d2
/system/bt/bta/dm/bta_dm_act.cc
65cca8f2ccdc9224162f81dded617de04be41313 07-Jun-2016 Manu Viswanadhan <manuv@codeaurora.org> Initializing the SDP event message pointer before sending

Use case: Crash while copying SDP results in case of SDP
ServiceSearchAttributeRequest failure

Steps : Repeated connection-disconnection with multiple devices

Failure: Crash while copying SDP results

Root cause: In case of SDP_ServiceSearchAttributeRequest failure,
garbage value sent for discovery result structure due to improper
initialization

Fix: Initialize the discovery result structure to zero before
sending

Test: code compilation.

Change-Id: I46d92d6262bae3b5def5401270465a3a06468c1a
/system/bt/bta/dm/bta_dm_act.cc
eab3651db4792695080d24b2a6e723a68cc62d22 05-Jan-2017 Jakub Pawlowski <jpawlowski@google.com> Batch scan simplification

Bug: 30622771
Test: sl4a UniqueFilteringTest BleOpportunisticScanTest
Change-Id: I0e6ca8ed3d7d98057277a5187e684246f410d978
/system/bt/bta/dm/bta_dm_act.cc
e39606565035a103562d0485a90b18962592ae97 29-Dec-2016 Jakub Pawlowski <jpawlowski@google.com> LE scanner BTA layer simplification

BTA layer for scanner is very complicated. This patch simplifies it:
* get rid of type redeclarations for BTM types
* get rid of trivial *_act methods and call BTM API directly where possible

Bug: 30622771
Test: slra FilterTest
Change-Id: I3899b30074b2abc4a3945c5cc14f1bb40a504876
/system/bt/bta/dm/bta_dm_act.cc
8843cc830b522cfe6f1e361297fc28fd331a1378 17-Apr-2014 Hemant Gupta <hemantg@codeaurora.org> HIDD: Add support for HID Device Role

This patch adds support for HID Device role in bluedroid stack allowing
DUT to be used as Keyboard or Mouse.

Bug: 33011576
Change-Id: I45b581a54f6c7bbc1f25226715a7ea23e34255c0
/system/bt/bta/dm/bta_dm_act.cc
2255250d9bb5c8c1354fc2b4685523d028dcf6f9 22-Dec-2016 Jakub Pawlowski <jpawlowski@google.com> Fix AdvertisingManager not being initialized

When BLE_VND_INCLUDED is not set, advertising was not properly
initialized, which resulted in stack crashes. This patch makes sure that
LE advertising is always properly initialized

Bug: 33168939
Test: enable LE advertising with BLE_VND_INCLUDED set to false
Change-Id: I5fa0b3da39da99e750e1f8b6f0452a628094bfc4
/system/bt/bta/dm/bta_dm_act.cc
30c4bfe8dd80be21ca118b159eff689ba8c16e5e 20-Dec-2016 Jakub Pawlowski <jpawlowski@google.com> Remove reduntant capabilities check

BTM layer checks if LE is avaliable, and if proper VSC are
avaliable, no need to do additional checks in BTA.

Test: sl4a FilteringTest
Bug: 30622771
Change-Id: I594b152d18f08a46b65930547a991dbb6f188c4b
/system/bt/bta/dm/bta_dm_act.cc
d494104585cfed560f81833a3417e00210881156 20-Dec-2016 Jakub Pawlowski <jpawlowski@google.com> Get rid of BLE_ANDROID_CONTROLLER_SCAN_FILTER

All calls to filter related code is guarded by check if HCI VSC are
available. There is no need to keep double check.

Test: sl4a FilteringTest
Bug: 30622771
Change-Id: Ib4c53593d536a2985926ef2b725bc69050bdb035
/system/bt/bta/dm/bta_dm_act.cc
808650d846bd302ca8636fb7464ff4aba940f1d5 18-Dec-2016 Jakub Pawlowski <jpawlowski@google.com> Modernize BLE Scanner implementation (2/3)

Get rid of BTA state machine states for BLE scanning.

Test: sl4a FilteringTest
Bug: 30622771
Change-Id: I8a879604f413c9980cf64983d8ef6b9a94669295
/system/bt/bta/dm/bta_dm_act.cc
709843216679a3c7852d7d254fde47a9d503abd8 16-Dec-2016 Jakub Pawlowski <jpawlowski@google.com> BLE scan filter setup simplification (2/3)

Bug: 30622771
Test: sl4a BleScanTest
Change-Id: I55e6c201849a057995c0c6fda1c52af826749922
/system/bt/bta/dm/bta_dm_act.cc
f2af1c42ccb2f642b241c2261b42d0be61d45438 13-Dec-2016 Jack He <siyuanh@google.com> Replace assert with CHECK from base/logging.h

* Replace assert with CHECK
* Remove all NDEBUG definitions
* Remove hacks for BT_LIBCHROME_NDEBUG
* Removed some removed directories from Makefile such as hcis, brcm, rpc

Coccinelle-assisted:

@@
@@

- #include "base/logging.h"
+ #include <base/logging.h>

@ assert_included @
@@

@ base_logging_included @
@@

@ depends on (assert_included && !(base_logging_included)) @
@@

- #include <assert.h>
+ #include <base/logging.h>

@ depends on (assert_included && base_logging_included) @
@@

- #include <assert.h>

@@
expression E;
@@

- assert(E);
+ CHECK(E);

And a bash script:

for file in $(find . -name "*.cc"); do
spatch --sp-file replace_assert_with_CHECK.cocci --in-place $file
done

The following files are maually edited:
btif/src/btif_config.cc
btif/src/btif_avrcp_audio_track.cc
btif/src/btif_gatt_client.cc
osi/src/data_dispatcher.cc
osi/src/reactor.cc
osi/src/thread.cc
osi/src/fixed_queue.cc
osi/src/list.cc
osi/src/allocation_tracker.cc
osi/src/alarm.cc
osi/test/wakelock_test.cc

Bug: 31781465
Test: Code compilation, Unit Tests, BtStressTest, BtFunhausMetricsTest
Change-Id: I21dc10a45be31665e41441b75b0515ed87523988
/system/bt/bta/dm/bta_dm_act.cc
221e9bf6c9e9f974efd92ea4f054dbdba248d2db 15-Dec-2016 Jakub Pawlowski <jpawlowski@google.com> BTA Application registration refactor

This patch replace BTA state machine state associated with registration
of new application, together with BTA_GATTC_API_REG_EVT, and
tBTA_GATTC_API_REG. Instead, it uses closure to post registration task,
and callback for registration event.

Bug: 30622771
Test: sl4a ConcurrentBleAdvertiserTest GattConnectTest
Change-Id: I62d68485170ef5472237d62b285353f2c9bc8250
/system/bt/bta/dm/bta_dm_act.cc
83211b0ccceb53586ac651a4d67ded7443b2f222 07-Dec-2016 Jakub Pawlowski <jpawlowski@google.com> Get rid of selective connection procedure

Bug: 30622771
Test: compilation test
Change-Id: I1a7e4c49f93f11a350b96ffe7b2e69974ed82f46
/system/bt/bta/dm/bta_dm_act.cc
f33b6f434f086b20fabe5913016bc423ac975057 23-Nov-2016 Marie Janssen <jamuraa@google.com> readability fix: No assigns in if conditionals

Coccinelle-assisted:
@@
variable i;
expression E;
statement S1, S2;
@@

+ i = E;
if (
(
- (i = E)
+ i
!= ...
|
- (i = E)
+ i
== ...
|
- (i = E)
+ i
< ...
|
- (i = E)
+ i
> ...
|
- (i = E)
+ i
<= ...
|
- (i = E)
+ i
>= ...
|
- (i = E)
+ i
)
) S1 else S2

for file in $(find . -name "*.cc"); do
spatch --sp no-if-assigns.cocci --in-place $file
done

clang-format --style=file -i bta/**/*.cc

Test: mma -j37 and basic sanity testing on angler, sailfish

Change-Id: I41a2964afac347c24e13869b6c172e321e646091
/system/bt/bta/dm/bta_dm_act.cc
9979121f0865e07432215529f9b157792ae3ef21 18-Nov-2016 Myles Watson <mylesgw@google.com> Remove BTA_GATT_INCLUDED

Test: Connect to a BLE Keyboard
Change-Id: I00393e2bf09fb65533e953896563e69aab5a22dc
/system/bt/bta/dm/bta_dm_act.cc
2e8e9f42132d0297a94c0852a1fbf45c9bc348e5 15-Nov-2016 Myles Watson <mylesgw@google.com> Remove SMP_INCLUDED define

Test: Connect to a BLE Keyboard
Change-Id: I785692cb61f4ca5ccccab7424aa03f50c54523c9
/system/bt/bta/dm/bta_dm_act.cc
84baa7f16e830394408278dbb8c508dd9fa02887 14-Nov-2016 Myles Watson <mylesgw@google.com> Remove BLE_INCLUDED define

Test: Connect to a BLE Keyboard
Change-Id: I5f8f4017c90c3c404004632fd10e6c2b93bd7783
/system/bt/bta/dm/bta_dm_act.cc
1baaae3f34a667058e7f0c5f778357d98320cf38 09-Nov-2016 Myles Watson <mylesgw@google.com> bta: Fix comment formatting after clang-format

Test: mma -j32
Change-Id: Ic945ac421b1918527105c59674eda89afd3d4126
/system/bt/bta/dm/bta_dm_act.cc
cd1fd07f1306e08fe048682dd5918987e579f937 09-Nov-2016 Myles Watson <mylesgw@google.com> bta: Apply clang-format

clang-format -i --style=file bta/*/*

(twice)

Test: mma -j32
Change-Id: Ib118b1dfb6a34f9a5bfe153d65841e9041165264
/system/bt/bta/dm/bta_dm_act.cc
8af480e24549ba51a3f6858d9d9af504715e0bea 09-Nov-2016 Myles Watson <mylesgw@google.com> bta: Remove double asterisks in comments

Double asterisks at the beginning of the line
sed -i s,"^[*][*]"," *", bta/*/*

Double asterisks after a space
sed -i s,"^ [*][*]\([^*]\)"," *\1", bta/*/*
sed -i s,"^ [*][*]$"," *", bta/*/*

Test: mma -j32
Change-Id: Ib83b802c7000176683b4e7f24d1255b3c2c6c01c
/system/bt/bta/dm/bta_dm_act.cc
3a2747fce1bf71c3396fe50799023eefd4c09849 01-Nov-2016 Jakub Pawlowski <jpawlowski@google.com> Remove unused BLE_PERIPHERAL_MODE_SUPPORT

This patch removes BLE_PERIPHERAL_MODE_SUPPORT and all code related to
it, which is unused.

Bug: 30622771
Bug: 24099160
Change-Id: Ic9cc2a94c8d1b974814d453ee8a0073e7d6deb85
/system/bt/bta/dm/bta_dm_act.cc
db76fa4d26d73402a3f03b288a0999f8694dbea8 01-Nov-2016 Jack He <siyuanh@google.com> Assign pairing code to bta_dm_cb before device name resolution

Device name resolution, BTM_ReadRemoteDeviceName(), will cause
bta_dm_sp_cback() to exit early and bta_dm_pinname_cback() callback
will be invoked after the resolution, which continues the pairing
with pairing code from bta_dm_cb.num_val. Hence, bta_dm_cb.num_val
needs to be assigned before BTM_ReadRemoteDeviceName() is called.

Test: manual
Bug: 31381715
Change-Id: I61f06a9d878dd72154d6621eb094dcea5f701cbc
/system/bt/bta/dm/bta_dm_act.cc
5ba79228abfeee8de6b65f28da180839445a693c 08-Jun-2016 Srinu Jella <sjella@codeaurora.org> Separated initialize and re-initialize of DM control block

Use Case: Turning ON Bluetooth failed after network reset

Steps:
1. Turn ON Bluetooth
2. Go to settings->backup and restore->network reset.
3. Do reset to reset BT, WIFI, data.
4. Go back to Bluetooth settings menu and try to turn ON Bluetooth.

Failure: Bluetooth is not turning ON after network reset

Root Cause: In case BTA_SYS_HW_OFF_EVT event, alarm_new is getting called.
Which is causing issue in Next Turn ON of Bluetooth if PID is same.

Fix: Separated initialize and re-initialize of DM control block

Test: code compilation.

Change-Id: I09abfb22c67f04626564a7791e4b61ec3a523cc1
/system/bt/bta/dm/bta_dm_act.cc
d35a648d39710bbc5ac59f8add85166455af5af7 27-Oct-2016 Myles Watson <mylesgw@google.com> Remove deprecated UNUSED macro (1/5)

Generated automatically with coccinelle

/* This rule matches functions with arguments
* that have an UNUSED(arg) in the body.
*/
@r1@
identifier arg;
identifier fn;
type t;
parameter list[n] P;
@@

fn(P, const t arg) { ...
UNUSED(arg);
...
}

/* This rule removes the UNUSED line, and adds
* UNUSED_ATTR to the parameter list.
*/
@depends on r1@
identifier r1.arg;
identifier r1.fn;
type r1.t;
parameter list[r1.n] r1.P;
typedef UNUSED_ATTR;
@@

fn(P,
- const t arg
+ UNUSED_ATTR GETRIDOFTHISCOMMA, const t arg
) { ...
-UNUSED(arg);
...
}

Test: mma -j32

Change-Id: Idcaadd688d669d484e557becd050e69454508f3c
/system/bt/bta/dm/bta_dm_act.cc
645ee14ce2327fff61f54d208763eca1c143063e 17-Jun-2016 Nitin Arora <niarora@codeaurora.org> Prevent multiple register of service change indication

Use Case:
Pair DUT to a remote LE device. The host registers for the service
change indication twice, once when the connection callback is
received and another time, when the SMP process completes

Failure:
There are a few issues caused by this.
First, the duplicate action of service change indication registeration
is unnecessary.
The registeration that follows the SMP process adds a gatt_if to the
apps holding the current link. This gatt_if (=1) never disconnects
after registeration failure or success. And hence the host can never
physically disconnect the link.

Fix:
This change removes the service change registeration at SMP
process completion

Test: manual
Change-Id: I0d7566e2b4a9d01aa7926cdbe9f528c3941fcfeb
/system/bt/bta/dm/bta_dm_act.cc
415d1120561ba38c7cd00f0e41d8fb69cda97601 18-Oct-2016 Andre Eisenbach <eisenbach@google.com> Reset device security flags when pairing fails

Bug: 29998634
Test: manual
(cherry picked from commit 54ee9431e8bf0ec1c47d7306fd7a3d0975590733)

Change-Id: I8bd0ce5b797e30009260f7fe673f389d066db9ac
/system/bt/bta/dm/bta_dm_act.cc
b2a292b5d8df2f359c38b0787bc01181225a9bc9 15-Oct-2016 Pavlin Radoslavov <pavlin@google.com> Renamed most C files to C++: *.c to *.cc

Also:
- Fixed C++ related compilation errors.
- Added missing 'extern "C"' guards in some of the header files.
- Added missing LOCAL_CPP_EXTENSION to Android.mk files.
- Added-back btif/src/btif_mce.cc and bta/mce/bta_mce_* to
btif/Android.mk and bta/Android.mk respectively.
- Fixed the alphabetical ordering of the *.cc files in some
of the Android.mk files.
- Added missing Copyright header to "osi/include/list.h"
- Updated "osi/src/wakelock.cc" to use C++ std::string
instead of dynamic allocation of C-style strings.

Test: code compilation, unit tests, and A2DP streaming
Change-Id: Ia2f7215ed9df32775c701b68fc86b09875b942c7
/system/bt/bta/dm/bta_dm_act.cc
00a53d14c8ec66334ff4b27586315a7a81d5475c 16-Aug-2016 Jakub Pawlowski <jpawlowski@google.com> Remove BTA layer components for LE advertising

Advertising is so simple, it doesn't need the BTA layer.
Values returned by BTM_VendorSpecificCommand shouldn't be handled as
success or failure, it's just to inform wether we sent the callback.

Bug: 30622771
Change-Id: I104c4fbf84d3818b76fe8c527fbde4e6c4336c3a
/system/bt/bta/dm/bta_dm_act.cc
6a9666116668683fb473239ff381dec16b784421 16-Aug-2016 Jakub Pawlowski <jpawlowski@google.com> Unify LE advertising instance identifiers

Up till now, we had three numbers associated with each advertising
instance: client_id, inst_id, and cbindex. We also had special structure
mapping each of those numbers to another.

From now on, when registering advertiser, we'll grab next free
advertising instance id and make advertiser_id equal to it. Thanks to
this, we can remove all the mapping and have just one number associated
with each advertising instance.

This also means we no longer need to pass *p_ref value to the BTM layer
with each request, as advertiser_id is equal to inst_id.

Bug: 30622771
Change-Id: Ied71bff36e30d6c6ce4ca3e62d46ba96320cf597
/system/bt/bta/dm/bta_dm_act.cc
5b12a83ba9775c6bce88b23a7c13ef70aa9b6bce 11-Aug-2016 Jakub Pawlowski <jpawlowski@google.com> Use closures in advertising related code

This patch is a preparation to get rid of BTA layer for advertising, and
for further refactoring required to keep this code maintainable.

Tests: SL4A/ConcurrentBleAdvertisingTest
Bug: 30622771
Change-Id: I574b57159390d090b16d264d3c1fba2f07b70d4c
/system/bt/bta/dm/bta_dm_act.cc
bd60854e49f88196bb3bcb38346214f8c6c3f3c9 28-Jul-2016 Jakub Pawlowski <jpawlowski@google.com> Add LE Secure Connection data parsing (3/4)

Bug: 30460956
Change-Id: I216142090fe99b25ef7697fceceb278b761a182b
/system/bt/bta/dm/bta_dm_act.cc
42657c2f2350c0b546f9b0d45e3167ed9f58f62e 09-Aug-2016 Satomi <michitsuta@casio.co.jp> Revert "Register for Service Changed notifications for untrusted devices"

This reverts commit 5f0e23d532f4f90d081ccc0e294f404eb5e5b688.

Instead of reusing service discovery data, gatt profile initiates
discovery by service uuid before regular service discovery is started,
and both discovery procedures interfere with each other.
As a result, link is dropped.

Bug: 30462943
Bug: 30481143
Change-Id: Ic63339f4f46eda70e575a4103974766d54a9d624
Signed-off-by: Satomi <michitsuta@casio.co.jp>
/system/bt/bta/dm/bta_dm_act.cc
d19e0785e662e640191a075eda07acce61c2aeda 15-Jul-2016 Marie Janssen <jamuraa@google.com> Use standard types, consistent ifdef style everywhere

Remove the typedefs in stack/include/bt_types.h

Use standard types everywhere.
Use standard style for #if statements:
- #if (VAR_NAME == TRUE)
- #if (VAR_NAME1 == TRUE && VAR_NAME2 == TRUE)
Use __func__ instead of __FUNCTION__
Fix some debug statements to use __func__

Update script to be less disruptive to aligned assignment blocks.

Change-Id: I8f8f068e6c26ce74fd3b3707e1e31fd0b919cdd0
/system/bt/bta/dm/bta_dm_act.cc
e9e58ced195ec2c983c7723c9cbdabd45eb0f2fd 17-Jun-2016 Marie Janssen <jamuraa@google.com> bta: use standard types

Use standard types everywhere.
Use standard style for #if statements:
- #if (VAR_NAME == TRUE)
- #if (VAR_NAME1 == TRUE && VAR_NAME2 == TRUE)
Use __func__ instead of __FUNCTION__
Fix some debug statements to use __func__

Change-Id: Ib86de4de9f14529ecaa4f71597260e3b5785360b
/system/bt/bta/dm/bta_dm_act.cc
b7938c1866dd8b92977e3ba3632de77fd877bace 27-May-2016 Jakub Pawlowski <jpawlowski@google.com> Convert HID and Device Manager BTA code to C++

These are the only places that use BTA GATTC API. After this change it's
possible to change GATT API to use C++ types as arguments.

Bug: 28485365
Change-Id: Idf83396f4bc3a2cc8a9b41f69da5d033af1be678
/system/bt/bta/dm/bta_dm_act.cc