OSDN Git Service

android-x86/system-bt.git
6 years agoRemove unnecesary BTA redefinitions for GATT part 4 am: 50ba9031b4
Jakub Pawlowski [Tue, 26 Sep 2017 23:16:05 +0000 (23:16 +0000)]
Remove unnecesary BTA redefinitions for GATT part 4 am: 50ba9031b4
am: f7fe18a4b7

Change-Id: I173f664d05ba5eb851cadcdd32a2d760ac81cadd

6 years agoRemove unnecesary BTA redefinitions for GATT part 3 am: ee9a11f903
Jakub Pawlowski [Tue, 26 Sep 2017 23:16:01 +0000 (23:16 +0000)]
Remove unnecesary BTA redefinitions for GATT part 3 am: ee9a11f903
am: 1006851a6a

Change-Id: I77bca0a70d92e842724c30515840cc73ebe6e29c

6 years agoRemove unnecesary BTA redefinitions for GATT part 2 am: e9ef00c3fb
Jakub Pawlowski [Tue, 26 Sep 2017 23:15:44 +0000 (23:15 +0000)]
Remove unnecesary BTA redefinitions for GATT part 2 am: e9ef00c3fb
am: 3041f65216

Change-Id: I2decc58bbbb4cc55b3ec2173ab70001a91e51a81

6 years agoRemove unnecesary BTA redefinitions for GATT part 1 am: ab7a368f3f
Jakub Pawlowski [Tue, 26 Sep 2017 23:10:57 +0000 (23:10 +0000)]
Remove unnecesary BTA redefinitions for GATT part 1 am: ab7a368f3f
am: 336f58333f

Change-Id: I4032e3a47085fabce3aca5b2a58562a3549074d0

6 years agoRemove unnecesary BTA redefinitions for GATT part 4
Jakub Pawlowski [Tue, 26 Sep 2017 23:08:15 +0000 (23:08 +0000)]
Remove unnecesary BTA redefinitions for GATT part 4
am: 50ba9031b4

Change-Id: Iec52c13db939ccfe3da63034661ef75fcde20265

6 years agoRemove unnecesary BTA redefinitions for GATT part 3
Jakub Pawlowski [Tue, 26 Sep 2017 23:08:11 +0000 (23:08 +0000)]
Remove unnecesary BTA redefinitions for GATT part 3
am: ee9a11f903

Change-Id: Ibc1c7a7586b6b1eda5f01be22bddc6447be79133

6 years agoRemove unnecesary BTA redefinitions for GATT part 2
Jakub Pawlowski [Tue, 26 Sep 2017 23:07:04 +0000 (23:07 +0000)]
Remove unnecesary BTA redefinitions for GATT part 2
am: e9ef00c3fb

Change-Id: I052607160b33ba78f153b68e018940d602e18254

6 years agoRemove unnecesary BTA redefinitions for GATT part 1
Jakub Pawlowski [Tue, 26 Sep 2017 23:07:00 +0000 (23:07 +0000)]
Remove unnecesary BTA redefinitions for GATT part 1
am: ab7a368f3f

Change-Id: Icb345dbfb20e26275cdb77e34f5d9e214d65eb03

6 years agoRemove unnecesary BTA redefinitions for GATT part 4
Jakub Pawlowski [Tue, 26 Sep 2017 15:45:20 +0000 (08:45 -0700)]
Remove unnecesary BTA redefinitions for GATT part 4

Test: compilation test
Change-Id: Ibe37a1c6506d567b68497e8c7074d90cd73ddf00

6 years agoRemove unnecesary BTA redefinitions for GATT part 3
Jakub Pawlowski [Tue, 26 Sep 2017 01:47:54 +0000 (18:47 -0700)]
Remove unnecesary BTA redefinitions for GATT part 3

Test: compilation test
Change-Id: I8d4b8cfd35fcb5ccd7067f1e02dedd1a58efa3ad

6 years agoRemove unnecesary BTA redefinitions for GATT part 2
Jakub Pawlowski [Tue, 26 Sep 2017 00:41:21 +0000 (17:41 -0700)]
Remove unnecesary BTA redefinitions for GATT part 2

Test: compilation test
Change-Id: Iaf81188596c33b92f79f163dc95187ed5c6f52a4

6 years agoRemove unnecesary BTA redefinitions for GATT part 1
Jakub Pawlowski [Tue, 26 Sep 2017 00:24:46 +0000 (17:24 -0700)]
Remove unnecesary BTA redefinitions for GATT part 1

Test: compilation test
Change-Id: I98ab63a187684ae4ffbb0cb23e5c9e67994be468

6 years agoBuild fix after UUID refactor for stage branch am: 30be4b9f9c
Jakub Pawlowski [Tue, 26 Sep 2017 11:06:12 +0000 (11:06 +0000)]
Build fix after UUID refactor for stage branch am: 30be4b9f9c
am: 23da4b4420

Change-Id: Idbd1a4759695753ccf4e615c4c28da2acd393b3e

6 years agoBuild fix after UUID refactor for stage branch
Jakub Pawlowski [Tue, 26 Sep 2017 10:55:06 +0000 (10:55 +0000)]
Build fix after UUID refactor for stage branch
am: 30be4b9f9c

Change-Id: I65278615668f57dd0e3f91cfeb726ef291509ea2

6 years agoBuild fix after UUID refactor for stage branch
Jakub Pawlowski [Tue, 26 Sep 2017 05:19:01 +0000 (22:19 -0700)]
Build fix after UUID refactor for stage branch

Change-Id: Ia01fa17ba40d315a912c391211e101a951eab562

6 years agoresolve merge conflicts of 819e2ecb8 to stage-aosp-master
Jakub Pawlowski [Tue, 26 Sep 2017 00:15:30 +0000 (00:15 +0000)]
resolve merge conflicts of 819e2ecb8 to stage-aosp-master
am: c7897e9511

Change-Id: Ibe6c576c39cc2c4ba17fa6374fc2548ce4180f4b

6 years agoresolve merge conflicts of 819e2ecb8 to stage-aosp-master
Jakub Pawlowski [Tue, 26 Sep 2017 00:10:29 +0000 (17:10 -0700)]
resolve merge conflicts of 819e2ecb8 to stage-aosp-master

Test: I tested this conflict resolution.
Change-Id: Id915d1a9011dba4b898d47f5e6d6546079733a4c

6 years agoUse one type for UUID (1/5)
Jakub Pawlowski [Mon, 10 Jul 2017 16:56:09 +0000 (09:56 -0700)]
Use one type for UUID (1/5)

Currently, we have few different representations for UUID in stack:
tBT_UUID, tSDP_UUID, bt_uuid_t, bluetooth:UUID, or uint8_t*.

Additionally, tBT_UUID and bt_uuid_t are used to hold UUID as 128bit
as Little Endian or Big Endian, depending on which part of stack (GATT
or SDP) is using it.

This patch is creating one type, bluetooth::Uuid, that will replace all
other types.

Bug: 66912853
Test: all sl4a tests for GATT and RFCOMM
Merged-In: Ia42d3233146db0488728ed6f878f99b368fe8838
Change-Id: Ia42d3233146db0488728ed6f878f99b368fe8838

6 years agoFix build error for AVRCP13 compat fix am: 544f7e1be9
Andre Eisenbach [Fri, 22 Sep 2017 20:19:44 +0000 (20:19 +0000)]
Fix build error for AVRCP13 compat fix am: 544f7e1be9
am: 7b1e826e9c

Change-Id: I174dd3f701a429cc8c31136bfebf5314d9231c5d

6 years agoChange our AVRCP capabilities if the remote device only supports 1.3 am: c8ab11a06a
Ajay Panicker [Fri, 22 Sep 2017 20:19:39 +0000 (20:19 +0000)]
Change our AVRCP capabilities if the remote device only supports 1.3 am: c8ab11a06a
am: 38cb8be9c3

Change-Id: I8faafdb28c8a636fd8fd56756c989ed140ede55a

6 years agoFix build error for AVRCP13 compat fix
Andre Eisenbach [Fri, 22 Sep 2017 20:15:26 +0000 (20:15 +0000)]
Fix build error for AVRCP13 compat fix
am: 544f7e1be9

Change-Id: I4acd192aea9c8c72d3ad1ab6c7b3f3ccf9bb868f

6 years agoChange our AVRCP capabilities if the remote device only supports 1.3
Ajay Panicker [Fri, 22 Sep 2017 20:15:23 +0000 (20:15 +0000)]
Change our AVRCP capabilities if the remote device only supports 1.3
am: c8ab11a06a

Change-Id: I0aee338bc6c387ea6060637c74d89fa0745c40e5

6 years agoMerge "Get rid of unused _DYNAMIC_MEMORY" am: 9c268d0a54
Hansong Zhang [Fri, 22 Sep 2017 19:47:37 +0000 (19:47 +0000)]
Merge "Get rid of unused _DYNAMIC_MEMORY" am: 9c268d0a54
am: af59c61d79

Change-Id: I4c19b4b60fb8a9c85be077b034939da09fcc04b2

6 years agoMerge "Get rid of unused _DYNAMIC_MEMORY"
Hansong Zhang [Fri, 22 Sep 2017 19:44:55 +0000 (19:44 +0000)]
Merge "Get rid of unused _DYNAMIC_MEMORY"
am: 9c268d0a54

Change-Id: Ida1e0fb77241f26153648ea325284d39636ba8c2

6 years agoMerge "Get rid of unused _DYNAMIC_MEMORY"
Hansong Zhang [Fri, 22 Sep 2017 19:39:05 +0000 (19:39 +0000)]
Merge "Get rid of unused _DYNAMIC_MEMORY"

6 years agoMerge "btlinux: Fix sepolicy for split policy (Treble) builds" am: f0c8830387
Rob Herring [Fri, 22 Sep 2017 18:41:02 +0000 (18:41 +0000)]
Merge "btlinux: Fix sepolicy for split policy (Treble) builds" am: f0c8830387
am: 7c47e41e49

Change-Id: I003d87b73306c84a934d9226d5c53dc65af2f54f

6 years agoMerge "btlinux: Fix sepolicy for split policy (Treble) builds"
Rob Herring [Fri, 22 Sep 2017 18:39:01 +0000 (18:39 +0000)]
Merge "btlinux: Fix sepolicy for split policy (Treble) builds"
am: f0c8830387

Change-Id: I96784cd7c6aa31b3638edd27a6bc8437888a95a0

6 years agoMerge "btlinux: Fix sepolicy for split policy (Treble) builds"
Treehugger Robot [Fri, 22 Sep 2017 18:32:43 +0000 (18:32 +0000)]
Merge "btlinux: Fix sepolicy for split policy (Treble) builds"

6 years agoChange our AVRCP capabilities if the remote device only supports 1.3 am: 6575e1630d
Ajay Panicker [Fri, 22 Sep 2017 18:07:20 +0000 (18:07 +0000)]
Change our AVRCP capabilities if the remote device only supports 1.3 am: 6575e1630d
am: 0011bff064

Change-Id: I874e58d6404ccf520a9e0c7d1e273bb7a415052b

6 years agoBluetooth: Add AVRCP 1.3 as a developer option for AVRCP version (2/2) am: 11b4d12b95
Ajay Panicker [Fri, 22 Sep 2017 18:07:08 +0000 (18:07 +0000)]
Bluetooth: Add AVRCP 1.3 as a developer option for AVRCP version (2/2) am: 11b4d12b95
am: 7e0f03fc0a  -s ours

Change-Id: I816a78902f724cd60a253ce8b2fdf07ac065eb25

6 years agoDon't reject notifications and wait until new addressed player is ready (2/2) am...
Ajay Panicker [Fri, 22 Sep 2017 18:07:01 +0000 (18:07 +0000)]
Don't reject notifications and wait until new addressed player is ready (2/2) am: b72a002756
am: 951f1a3a1b

Change-Id: I157525b6d7b2b71d27bbc3305d5b00714e4125ca

6 years agoGet rid of unused _DYNAMIC_MEMORY
Hansong Zhang [Wed, 20 Sep 2017 16:31:32 +0000 (09:31 -0700)]
Get rid of unused _DYNAMIC_MEMORY

Removed the unused BTA_DYNAMIC_MEMORY and HID_DYNAMIC_LIBRARY

Bug: 27731905
Test: Manual
Change-Id: I6019584b165471c4058a2ec7ef8f278531153d18

6 years agoFix build error for AVRCP13 compat fix
Andre Eisenbach [Sat, 16 Sep 2017 07:22:10 +0000 (00:22 -0700)]
Fix build error for AVRCP13 compat fix

Bug: 37943083
Test: manual
Change-Id: I3974192dd007804f90f35a724a39824ed093a633
Merged-In: I6d041590dc51d7e8711b17fb1cb9c880b640052a

6 years agoChange our AVRCP capabilities if the remote device only supports 1.3
Ajay Panicker [Wed, 6 Sep 2017 16:59:51 +0000 (09:59 -0700)]
Change our AVRCP capabilities if the remote device only supports 1.3

This prevents issues with devices that only support 1.3 but can not
handle forward compatability like some Alpine Carkits.

Bug: 37943083
Test: Connect to Alpine carkit that only supports 1.3 and see new features
      are used.

Change-Id: I6d041590dc51d7e8711b17fb1cb9c880b640052a
Merged-In: I6d041590dc51d7e8711b17fb1cb9c880b640052a
(cherry picked from commit f9f1c8b449efb9cb7894a64fe2977f875679ba52)
(cherry picked from commit ff2d86ed3af91099597d033a76a143437543d6fd)

6 years agoChange our AVRCP capabilities if the remote device only supports 1.3
Ajay Panicker [Fri, 22 Sep 2017 17:16:24 +0000 (17:16 +0000)]
Change our AVRCP capabilities if the remote device only supports 1.3
am: 6575e1630d

Change-Id: I7cd19034fd4bf513c4ec9a5b07b8ac5508651cd7

6 years agoBluetooth: Add AVRCP 1.3 as a developer option for AVRCP version (2/2)
Ajay Panicker [Fri, 22 Sep 2017 17:16:15 +0000 (17:16 +0000)]
Bluetooth: Add AVRCP 1.3 as a developer option for AVRCP version (2/2)
am: 11b4d12b95

Change-Id: Idda00ee6b53c92c66a9ca4bbb0007319921f0f8a

6 years agoDon't reject notifications and wait until new addressed player is ready (2/2)
Ajay Panicker [Fri, 22 Sep 2017 17:16:08 +0000 (17:16 +0000)]
Don't reject notifications and wait until new addressed player is ready (2/2)
am: b72a002756

Change-Id: Ia004dcaf31a939f58b8624fcb7b2e239df469078

6 years agoChange our AVRCP capabilities if the remote device only supports 1.3
Ajay Panicker [Wed, 6 Sep 2017 16:59:51 +0000 (09:59 -0700)]
Change our AVRCP capabilities if the remote device only supports 1.3

This prevents issues with devices that only support 1.3 but can not
handle forward compatability like some Alpine Carkits.

Bug: 37943083
Test: Connect to Alpine carkit that only supports 1.3 and see new features
      are used.

Change-Id: I6d041590dc51d7e8711b17fb1cb9c880b640052a
(cherry picked from commit f9f1c8b449efb9cb7894a64fe2977f875679ba52)

6 years agoBluetooth: Add AVRCP 1.3 as a developer option for AVRCP version (2/2)
Ajay Panicker [Fri, 1 Sep 2017 19:07:42 +0000 (12:07 -0700)]
Bluetooth: Add AVRCP 1.3 as a developer option for AVRCP version (2/2)

This is requied for the 2012 Mazda 3 carkit as the carkit refuses to send
AVRCP commands other than passthrough commands when the version is anything
else. AVRCP 1.3 is compatible with most carkits on the market and can be
used to get most carkits working at the cost of losing many features.

Bug: 37943083
Test: Set AVRCP 1.3 in developer options and see that SDP and the AVRCP
      capabilites have updated to reflect this.
      TestTracker: 105915/3975

Change-Id: Iffc7ed1dd91eecb699153125b25451de5826f202
(cherry picked from commit 2369a95e6ed0c16f61237fe9c1fc5a90d97129c1)

6 years agoDon't reject notifications and wait until new addressed player is ready (2/2)
Ajay Panicker [Wed, 30 Aug 2017 01:30:43 +0000 (18:30 -0700)]
Don't reject notifications and wait until new addressed player is ready (2/2)

There are some carkits like the ones found in the 2016 Honda CRZ and some
Audi's that do not follow the spec and do not honor reject pending notification
messages after switching players. This causes an issue whenever you switch
players, the metadata freezes due to the fact that the carkit never re-registers
for new track changed notifications. This patch removes the reject notification
and reorders the current notifications.

Bug: 64142363
Test: Test with Audi S7 and 2016 Honda CRZ and see that switching players works
      TestTracker: 105391/3975
Change-Id: Iaec70863594e13217916ab740d529f526d27c2d1
(cherry picked from commit dd535e70c767fe214c1634b46618d0fb5ed4385d)

6 years agoGAP: Set service_id before calling gap_release_ccb am: 4c6208fd2d
Myles Watson [Thu, 21 Sep 2017 22:01:26 +0000 (22:01 +0000)]
GAP: Set service_id before calling gap_release_ccb am: 4c6208fd2d
am: acf7e8e1ac

Change-Id: I802897e8f613f1f19bd7b2a06b3dc818041f71a1

6 years agoGAP: Set service_id before calling gap_release_ccb
Myles Watson [Thu, 21 Sep 2017 21:52:54 +0000 (21:52 +0000)]
GAP: Set service_id before calling gap_release_ccb
am: 4c6208fd2d

Change-Id: I705d78e301414308a7150a20576f61a9e95f35c3

6 years agoGAP: Set service_id before calling gap_release_ccb
Myles Watson [Thu, 14 Sep 2017 21:13:44 +0000 (14:13 -0700)]
GAP: Set service_id before calling gap_release_ccb

Calling gap_release_ccb with a service_id == 0, which in turn
calls BTM_SecClrService with an ID of 0.

From the documentation for BTM_SecClrService:

  Service ID - Id of the service to remove. '0' removes all
               service records (except SDP).

Bug: 6569576965223508
Test: BLE connection and characteristic read
Change-Id: Icf309807f02e1faa273cf9bad9c09d9221a8bbfd
(cherry picked from commit 5c5c10683e2a11162838297fc8054b15837c4f32)
(cherry picked from commit 4023c6731d5e991c6202d4e499b9dd43d642fb3c)

6 years agoGet rid of libhardware dependency in native daemon am: 8c273b3700
Jakub Pawlowski [Wed, 20 Sep 2017 22:34:30 +0000 (22:34 +0000)]
Get rid of libhardware dependency in native daemon am: 8c273b3700
am: 7959aec405

Change-Id: I556ef243394b01a6889bd7a6c0a4a116fe8653ef

6 years agoGet rid of libhardware dependency in native daemon
Jakub Pawlowski [Wed, 20 Sep 2017 22:32:26 +0000 (22:32 +0000)]
Get rid of libhardware dependency in native daemon
am: 8c273b3700

Change-Id: I9b2d7c3dd6cf7bbd0fcc5c6e39cf9ebf1d68e7aa

6 years agoLoosen libhardware dependency am: b1aa65fbb3
Jakub Pawlowski [Wed, 20 Sep 2017 21:55:23 +0000 (21:55 +0000)]
Loosen libhardware dependency am: b1aa65fbb3
am: 9a586e4b53

Change-Id: Iec1bd55eb4515b1e58daacae7837dde66572d0c8

6 years agoLoosen libhardware dependency
Jakub Pawlowski [Wed, 20 Sep 2017 21:53:23 +0000 (21:53 +0000)]
Loosen libhardware dependency
am: b1aa65fbb3

Change-Id: Icd6842ffc2f5411c5f41c2c811b124b78796d3af

6 years agoGet rid of libhardware dependency in native daemon
Jakub Pawlowski [Wed, 20 Sep 2017 20:52:11 +0000 (13:52 -0700)]
Get rid of libhardware dependency in native daemon

Test: compilation test
Bug: 66187274
Change-Id: I97ee33a55315f44dc03083d1a8da9a38d5619725

6 years agoLoosen libhardware dependency
Jakub Pawlowski [Wed, 20 Sep 2017 20:16:11 +0000 (13:16 -0700)]
Loosen libhardware dependency

In most places we don't really need the libhardware library, just the
headers.

Bug: 66187274
Test: compilation test
Change-Id: Ifa2f547165fcf8b34bc29ab80d2bd12ce02f4ae1

6 years agoEnable extra A2DP control log messages am: 7b67302a28
Pavlin Radoslavov [Wed, 20 Sep 2017 19:49:14 +0000 (19:49 +0000)]
Enable extra A2DP control log messages am: 7b67302a28
am: 98c3a8e046

Change-Id: Icfd063f42b0cf78dc5b3971a1a3f8dc9800cfc01

6 years agoEnable extra A2DP control log messages
Pavlin Radoslavov [Wed, 20 Sep 2017 19:47:14 +0000 (19:47 +0000)]
Enable extra A2DP control log messages
am: 7b67302a28

Change-Id: I0247ee2d4e174b46df2d6c9f37b666fbe3b969f3

6 years agoEnable extra A2DP control log messages
Pavlin Radoslavov [Wed, 20 Sep 2017 03:29:33 +0000 (20:29 -0700)]
Enable extra A2DP control log messages

Also, fixed a log message when failed to accept the
corresponding socket socket.

Test: manual
Bug: 63949429
Change-Id: I6d9af32f61974a739d179c37da36c360aefcca79

6 years agoBLE Adv RPA is not updated on first timeout am: de1203d8cc
Sunny Kapdi [Tue, 19 Sep 2017 20:03:39 +0000 (20:03 +0000)]
BLE Adv RPA is not updated on first timeout am: de1203d8cc
am: 33f363e634

Change-Id: I89c2c80b03b77e5a5b7e216e9a286887d1306e57

6 years agoBLE Adv RPA is not updated on first timeout
Sunny Kapdi [Tue, 19 Sep 2017 20:01:39 +0000 (20:01 +0000)]
BLE Adv RPA is not updated on first timeout
am: de1203d8cc

Change-Id: I20fa5876f0d091a680ae4028e63a50051f390b8e

6 years agoBLE Adv RPA is not updated on first timeout
Sunny Kapdi [Tue, 19 Sep 2017 01:14:13 +0000 (18:14 -0700)]
BLE Adv RPA is not updated on first timeout

BLE Advertisement RPA is getting updated with the
same RPA instead of the newly generated RPA on the
first timeout. Make sure to send the newly generated
RPA to the Controller.

CRs-Fixed: 2111232
Bug: 65857055
Change-Id: I4d8e95c26fe8e5944fdee32089b8fcaffa238367

6 years agobtlinux: Fix sepolicy for split policy (Treble) builds
Rob Herring [Mon, 18 Sep 2017 14:25:58 +0000 (09:25 -0500)]
btlinux: Fix sepolicy for split policy (Treble) builds

In full Treble builds, the btlinux HAL fails to build the sepolicy:

neverallow check failed at out/target/product/linaro_x86_64/obj/ETC/plat_sepolicy.cil_intermediates/plat_sepolicy.cil:4518
from system/sepolicy/public/domain.te:673
  (neverallow base_typeattr_55 base_typeattr_56 (file (execute execute_no_trans entrypoint)))
    <root>
    allow at out/target/product/linaro_x86_64/obj/ETC/nonplat_sepolicy.cil_intermediates/nonplat_sepolicy.cil:6054
      (allow hal_bluetooth_btlinux hal_bluetooth_btlinux_exec (file (read getattr map execute entrypoint open)))

Test: Build completes successfully
Change-Id: Ibb8dbe7f2ca823c87ae4404c40cdc35656c8e0af
Signed-off-by: Rob Herring <robh@kernel.org>
6 years agoFix build error for AVRCP13 compat fix
Andre Eisenbach [Sat, 16 Sep 2017 15:27:43 +0000 (15:27 +0000)]
Fix build error for AVRCP13 compat fix
am: ab0fec08a4

Change-Id: Ia47840da1e2536eb5a8d226771a9baff8c0a277a

6 years agoChange our AVRCP capabilities if the remote device only supports 1.3
Ajay Panicker [Sat, 16 Sep 2017 15:27:38 +0000 (15:27 +0000)]
Change our AVRCP capabilities if the remote device only supports 1.3
am: ff2d86ed3a

Change-Id: I8787fd127a2e02c195d76d4d6c60756c4b16dfd4

6 years agoFix build error for AVRCP13 compat fix
Andre Eisenbach [Sat, 16 Sep 2017 07:22:10 +0000 (00:22 -0700)]
Fix build error for AVRCP13 compat fix

Bug: 37943083
Test: manual
Change-Id: I3974192dd007804f90f35a724a39824ed093a633
Merged-In: I6d041590dc51d7e8711b17fb1cb9c880b640052a

6 years agoChange our AVRCP capabilities if the remote device only supports 1.3
Ajay Panicker [Wed, 6 Sep 2017 16:59:51 +0000 (09:59 -0700)]
Change our AVRCP capabilities if the remote device only supports 1.3

This prevents issues with devices that only support 1.3 but can not
handle forward compatability like some Alpine Carkits.

Bug: 37943083
Test: Connect to Alpine carkit that only supports 1.3 and see new features
      are used.

Change-Id: I6d041590dc51d7e8711b17fb1cb9c880b640052a
Merged-In: I6d041590dc51d7e8711b17fb1cb9c880b640052a
(cherry picked from commit f9f1c8b449efb9cb7894a64fe2977f875679ba52)

6 years agoMerge "Clean-up BTIF profile queue on profile shutdown" am: 643c869ca2
Jack He [Sat, 16 Sep 2017 06:30:37 +0000 (06:30 +0000)]
Merge "Clean-up BTIF profile queue on profile shutdown" am: 643c869ca2
am: 0ee292a4d0

Change-Id: I9fdffd82475266ea2fae4fb65f039ec81775e521

6 years agoMerge "Clean-up BTIF profile queue on profile shutdown"
Jack He [Sat, 16 Sep 2017 06:27:37 +0000 (06:27 +0000)]
Merge "Clean-up BTIF profile queue on profile shutdown"
am: 643c869ca2

Change-Id: I7c22ae8dd883edacbe532f93d9e6a279f168d5ac

6 years agoDO NOT MERGE Fix unknown type issue in unit tests
Jack He [Sat, 16 Sep 2017 06:25:13 +0000 (06:25 +0000)]
DO NOT MERGE Fix unknown type issue in unit tests
am: 9b4aebb1ba  -s ours

Change-Id: Ief005c60c2372c1b8fa95a3a4459147f6e2009b0

6 years agoClean-up BTIF profile queue on profile shutdown
Jack He [Sat, 16 Sep 2017 06:25:07 +0000 (06:25 +0000)]
Clean-up BTIF profile queue on profile shutdown
am: a2d0cbc35a

Change-Id: I42e2f4d5e273c83c4e935b0263b707b5442ec619

6 years agoMerge "Clean-up BTIF profile queue on profile shutdown"
Treehugger Robot [Sat, 16 Sep 2017 06:24:09 +0000 (06:24 +0000)]
Merge "Clean-up BTIF profile queue on profile shutdown"

6 years agoDO NOT MERGE Fix unknown type issue in unit tests
Jack He [Sat, 16 Sep 2017 01:03:29 +0000 (18:03 -0700)]
DO NOT MERGE Fix unknown type issue in unit tests

Bug: 63790458
Test: build, unit test
Change-Id: If5e403907292aa25c8d39b17f2f1818d493433e6
Merged-In: I28288c295b7ca0259b2112c11b4e5a81d6f2e33c

6 years agoClean-up BTIF profile queue on profile shutdown
Jack He [Fri, 15 Sep 2017 00:13:19 +0000 (17:13 -0700)]
Clean-up BTIF profile queue on profile shutdown

* Add btif_profile_cleanup(uuid) method to remove pending connection
  requests for individual UUIDs
* Call the above method in each profile's clean-up method
* Add unit tests for btif_profile_queue

Bug: 63790458
Test: make, unit tests, pair and connect car kits
Change-Id: I28288c295b7ca0259b2112c11b4e5a81d6f2e33c
Merged-In: I28288c295b7ca0259b2112c11b4e5a81d6f2e33c
(cherry picked from commit d366807102bce97e494e83570d757ebcb6a33b3c)

6 years agoSetPreferredPhy/ReadPhy callback fix am: d08d44e09b
Jakub Pawlowski [Sat, 16 Sep 2017 00:26:42 +0000 (00:26 +0000)]
SetPreferredPhy/ReadPhy callback fix am: d08d44e09b
am: 6891e6f7c8

Change-Id: I07157be624a2b5aac9dcd7862cbffa4ba19a278d

6 years agoSetPreferredPhy/ReadPhy callback fix
Jakub Pawlowski [Sat, 16 Sep 2017 00:24:11 +0000 (00:24 +0000)]
SetPreferredPhy/ReadPhy callback fix
am: d08d44e09b

Change-Id: I81698e198eb7be1e4b11efb16f8c43311ed4a029

6 years agoMerge "Don't reject notifications and wait until new addressed player is ready (2...
Ajay Panicker [Sat, 16 Sep 2017 00:14:27 +0000 (00:14 +0000)]
Merge "Don't reject notifications and wait until new addressed player is ready (2/2)" into oc-dr1-dev
am: 7fba61cf06

Change-Id: I26368f08958d60e52a6e6cf22b6bd88ddd902682

6 years agoMerge "Don't reject notifications and wait until new addressed player is ready (2...
TreeHugger Robot [Sat, 16 Sep 2017 00:10:43 +0000 (00:10 +0000)]
Merge "Don't reject notifications and wait until new addressed player is ready (2/2)" into oc-dr1-dev

6 years agoGAP: Set service_id before calling gap_release_ccb
Myles Watson [Fri, 15 Sep 2017 23:37:42 +0000 (23:37 +0000)]
GAP: Set service_id before calling gap_release_ccb
am: f606990828  -s ours

Change-Id: I673dd88b298cb58b94bbd8326066af93e5a2e2f4

6 years agoGAP: Set service_id before calling gap_release_ccb
Myles Watson [Thu, 14 Sep 2017 21:13:44 +0000 (14:13 -0700)]
GAP: Set service_id before calling gap_release_ccb

Calling gap_release_ccb with a service_id == 0, which in turn
calls BTM_SecClrService with an ID of 0.

From the documentation for BTM_SecClrService:

  Service ID - Id of the service to remove. '0' removes all
               service records (except SDP).

Bug: 6569576965223508
Test: BLE connection and characteristic read
Change-Id: Icf309807f02e1faa273cf9bad9c09d9221a8bbfd
Merged-In: Icf309807f02e1faa273cf9bad9c09d9221a8bbfd
(cherry picked from commit 5c5c10683e2a11162838297fc8054b15837c4f32)
(cherry picked from commit 4023c6731d5e991c6202d4e499b9dd43d642fb3c)

6 years agoDon't reject notifications and wait until new addressed player is ready (2/2)
Ajay Panicker [Wed, 30 Aug 2017 01:30:43 +0000 (18:30 -0700)]
Don't reject notifications and wait until new addressed player is ready (2/2)

There are some carkits like the ones found in the 2016 Honda CRZ and some
Audi's that do not follow the spec and do not honor reject pending notification
messages after switching players. This causes an issue whenever you switch
players, the metadata freezes due to the fact that the carkit never re-registers
for new track changed notifications. This patch removes the reject notification
and reorders the current notifications.

Bug: 64142363
Test: Test with Audi S7 and 2016 Honda CRZ and see that switching players works
      TestTracker: 105391/3975
Change-Id: Iaec70863594e13217916ab740d529f526d27c2d1
Merged-In: Iaec70863594e13217916ab740d529f526d27c2d1
(cherry picked from commit dd535e70c767fe214c1634b46618d0fb5ed4385d)

6 years agoClean-up BTIF profile queue on profile shutdown
Jack He [Fri, 15 Sep 2017 00:13:19 +0000 (17:13 -0700)]
Clean-up BTIF profile queue on profile shutdown

* Add btif_profile_cleanup(uuid) method to remove pending connection
  requests for individual UUIDs
* Call the above method in each profile's clean-up method
* Add unit tests for btif_profile_queue

Bug: 63790458
Test: make, unit tests, pair and connect car kits
Change-Id: I28288c295b7ca0259b2112c11b4e5a81d6f2e33c

6 years agoSetPreferredPhy/ReadPhy callback fix
Jakub Pawlowski [Fri, 15 Sep 2017 20:43:40 +0000 (13:43 -0700)]
SetPreferredPhy/ReadPhy callback fix

Bug: 65746728
Test: manual
Change-Id: Ifdd8e7051c953aa1c006abecd62d1af196619d98

6 years agoMerge "GAP: Set service_id before calling gap_release_ccb" am: 57c849d1e5
Myles Watson [Fri, 15 Sep 2017 02:07:17 +0000 (02:07 +0000)]
Merge "GAP: Set service_id before calling gap_release_ccb" am: 57c849d1e5
am: 237c160b0f

Change-Id: I7be10eec1e5ab580dc0154b05bfac2f19c271d52

6 years agoMerge "GAP: Set service_id before calling gap_release_ccb"
Myles Watson [Fri, 15 Sep 2017 01:31:08 +0000 (01:31 +0000)]
Merge "GAP: Set service_id before calling gap_release_ccb"
am: 57c849d1e5

Change-Id: I9f3a6f08ab43b124d947355e158ee437fdea3bd8

6 years agoFix included service parsing (1/3) am: fae9b2fae0
Jakub Pawlowski [Fri, 15 Sep 2017 00:02:07 +0000 (00:02 +0000)]
Fix included service parsing (1/3) am: fae9b2fae0
am: bd349a88b8

Change-Id: Ibff59691dedd9797a8ace2a9585a7a1f8a2a7e3e

6 years agoMerge "GAP: Set service_id before calling gap_release_ccb"
Treehugger Robot [Thu, 14 Sep 2017 23:45:01 +0000 (23:45 +0000)]
Merge "GAP: Set service_id before calling gap_release_ccb"

6 years agoEnsure that services are cleaned from the GattServer HandleMap. am: eb215402e3
Jeremy Klein [Thu, 14 Sep 2017 23:43:55 +0000 (23:43 +0000)]
Ensure that services are cleaned from the GattServer HandleMap. am: eb215402e3
am: 04dd67f8e2

Change-Id: Ib881154009e22bd2e26806a3e4433401afc4d548

6 years agoEnsure that services are cleaned from the GattServer HandleMap.
Jeremy Klein [Thu, 14 Sep 2017 23:38:53 +0000 (23:38 +0000)]
Ensure that services are cleaned from the GattServer HandleMap.
am: eb215402e3

Change-Id: Ic509b64189fccf8c48afaf947d625a8998b389af

6 years agoFix included service parsing (1/3)
Jakub Pawlowski [Thu, 14 Sep 2017 23:36:09 +0000 (23:36 +0000)]
Fix included service parsing (1/3)
am: fae9b2fae0

Change-Id: I0c331c732ad09f3cf06ecaefbc6c5255f82f5b35

6 years agoGAP: Set service_id before calling gap_release_ccb
Myles Watson [Thu, 14 Sep 2017 21:13:44 +0000 (14:13 -0700)]
GAP: Set service_id before calling gap_release_ccb

Calling gap_release_ccb with a service_id == 0, which in turn
calls BTM_SecClrService with an ID of 0.

From the documentation for BTM_SecClrService:

  Service ID - Id of the service to remove. '0' removes all
               service records (except SDP).

Test: BLE connection and characteristic read
Change-Id: Icf309807f02e1faa273cf9bad9c09d9221a8bbfd

6 years agoEnsure that services are cleaned from the GattServer HandleMap.
Jeremy Klein [Fri, 8 Sep 2017 21:04:39 +0000 (14:04 -0700)]
Ensure that services are cleaned from the GattServer HandleMap.

The incorrect service handle was being plumbed up to onServiceDeleted.
This was causing stale entries to stick around forever in the HandleMap,
which could later cause failures to find callback references in
ContextMap if the connection ID changed for a given device.

Bug: 65463237
Test: unit tests modified and run
Change-Id: I2e22858b447f4e6b5a4fbceee4c406191c84a67d
(cherry picked from commit e631789075f5625fd79c774678f4af0bf102c7d1)

6 years agoFix included service parsing (1/3)
Jakub Pawlowski [Thu, 14 Sep 2017 18:40:32 +0000 (11:40 -0700)]
Fix included service parsing (1/3)

Bug: 65637368
Test: sl4a GattIncludedServiceTest
Change-Id: Icb882d411a75a91e3fea050f00c40e76de3539de

6 years agoAdd Suspend/Resume for advertising am: 757e9b24ed
Jakub Pawlowski [Wed, 13 Sep 2017 23:09:29 +0000 (23:09 +0000)]
Add Suspend/Resume for advertising am: 757e9b24ed
am: 577f0a8c9d

Change-Id: Id5af50fd5fdf9f3d019b60047f6607a1cfe684ac

6 years agoAdd Suspend/Resume for advertising
Jakub Pawlowski [Wed, 13 Sep 2017 22:44:15 +0000 (22:44 +0000)]
Add Suspend/Resume for advertising
am: 757e9b24ed

Change-Id: I11faa51795bc58831781bb229d22b35717018d6c

6 years agoAdd Suspend/Resume for advertising
Jakub Pawlowski [Mon, 28 Aug 2017 16:56:13 +0000 (09:56 -0700)]
Add Suspend/Resume for advertising

This is needed for resolving list handling.

Bug: 64846264
Test: updated unit tests
Change-Id: I3d9c7b90d3b69d459d33c4ca7a9849ca3a7abc40

6 years agoMerge "btm: Clear LINK_KEY_KNOWN flag for temporary connections" am: e5ed4dcc90
Myles Watson [Tue, 12 Sep 2017 22:08:59 +0000 (22:08 +0000)]
Merge "btm: Clear LINK_KEY_KNOWN flag for temporary connections" am: e5ed4dcc90
am: d1bed4781d

Change-Id: Id9f61a171f8095c43d0802a404c9133f7539a9b1

6 years agoMerge "btm: Clear LINK_KEY_KNOWN flag for temporary connections"
Myles Watson [Tue, 12 Sep 2017 22:01:28 +0000 (22:01 +0000)]
Merge "btm: Clear LINK_KEY_KNOWN flag for temporary connections"
am: e5ed4dcc90

Change-Id: I2f01c85dcb9af27ff13d6e129ceb64d62e06774e

6 years agoMerge "btm: Clear LINK_KEY_KNOWN flag for temporary connections"
Treehugger Robot [Tue, 12 Sep 2017 21:50:08 +0000 (21:50 +0000)]
Merge "btm: Clear LINK_KEY_KNOWN flag for temporary connections"

6 years agoFix ASAN crash inside btif_av_event_deep_copy() am: 6d07e45b9a
Pavlin Radoslavov [Tue, 12 Sep 2017 21:17:19 +0000 (21:17 +0000)]
Fix ASAN crash inside btif_av_event_deep_copy() am: 6d07e45b9a
am: b4051180e9

Change-Id: I6733ac9351963ce46cb5cf1f2d2aea8b6e57b3c2

6 years agoReturn the correct status when BTA_AV Open failed because of role switch am: 54bdc23b04
Pavlin Radoslavov [Tue, 12 Sep 2017 21:16:55 +0000 (21:16 +0000)]
Return the correct status when BTA_AV Open failed because of role switch am: 54bdc23b04
am: d2e2f4a8c7

Change-Id: I118084987a3911b2d49af89beb1c6611931a6380

6 years agoFix ASAN crash inside btif_av_event_deep_copy()
Pavlin Radoslavov [Tue, 12 Sep 2017 21:11:46 +0000 (21:11 +0000)]
Fix ASAN crash inside btif_av_event_deep_copy()
am: 6d07e45b9a

Change-Id: I67be39dfaa463b7d2ab8124001f8edb342a338e6

6 years agoReturn the correct status when BTA_AV Open failed because of role switch
Pavlin Radoslavov [Tue, 12 Sep 2017 21:11:25 +0000 (21:11 +0000)]
Return the correct status when BTA_AV Open failed because of role switch
am: 54bdc23b04

Change-Id: I8ad18c4488fbe5c33aaea72b5b113270c974aef3

6 years agobtm: Clear LINK_KEY_KNOWN flag for temporary connections
Myles Watson [Tue, 12 Sep 2017 15:23:23 +0000 (08:23 -0700)]
btm: Clear LINK_KEY_KNOWN flag for temporary connections

Bug: 62561154
Test: Smart Setup, erase target, Smart Setup
Change-Id: Icba672a38772dc99a74f351301c81d66f37ee929

6 years agoFix ASAN crash inside btif_av_event_deep_copy()
Pavlin Radoslavov [Tue, 12 Sep 2017 19:08:49 +0000 (12:08 -0700)]
Fix ASAN crash inside btif_av_event_deep_copy()

Allocate sufficient data on the stack that can be safely copied inside
btif_av_event_deep_copy()

Bug: 65524264
Test: Run Bluetooth on ASAN enabled build
Change-Id: Ie6d4a28933302131c58eb4aee34161e435634377

6 years agoReturn the correct status when BTA_AV Open failed because of role switch
Pavlin Radoslavov [Tue, 12 Sep 2017 18:51:21 +0000 (11:51 -0700)]
Return the correct status when BTA_AV Open failed because of role switch

Bug: 65588660
Test: Code compilation
Change-Id: I705ec28c76f2342e18bece193005c962b9febac8

6 years agoFix MAC address byte ordering in the uniq field am: 7bc0edda0f
Kim Low [Tue, 12 Sep 2017 19:07:02 +0000 (19:07 +0000)]
Fix MAC address byte ordering in the uniq field am: 7bc0edda0f
am: ca395d2933

Change-Id: I8612b828de29fe173194d881a4da65c14ccb468e