OSDN Git Service
Srinu Jella [Thu, 6 Jul 2017 00:26:39 +0000 (00:26 +0000)]
Merge "Don't initiate role switch for blacklisted devices" am:
14eac9efa0 am:
026e94bba3
am:
42b8dd6bed
Change-Id: I91dd1ca0e433d7cc805176b598403b1bf0717faa
Srinu Jella [Thu, 6 Jul 2017 00:25:51 +0000 (00:25 +0000)]
Merge "Don't initiate role switch for blacklisted devices" am:
14eac9efa0
am:
026e94bba3
Change-Id: Iffe7268e4e5c401888780bc5481afd916437dea0
Srinu Jella [Thu, 6 Jul 2017 00:23:52 +0000 (00:23 +0000)]
Merge "Don't initiate role switch for blacklisted devices"
am:
14eac9efa0
Change-Id: I87ffd1fcd4ff76c702eb895a528598c585aeaebb
Treehugger Robot [Thu, 6 Jul 2017 00:19:02 +0000 (00:19 +0000)]
Merge "Don't initiate role switch for blacklisted devices"
Satish Patel [Wed, 5 Jul 2017 23:40:53 +0000 (23:40 +0000)]
Merge "Generic Bluetooth HAL for standard Linux hci interface" am:
6c34c8adc1 am:
21338c7656
am:
5c3131c72c
Change-Id: I57a76a52ca9096c5d57f5ae75b393918bf3684dc
Satish Patel [Wed, 5 Jul 2017 23:35:07 +0000 (23:35 +0000)]
Merge "Generic Bluetooth HAL for standard Linux hci interface" am:
6c34c8adc1
am:
21338c7656
Change-Id: Ibb456aeceeca74de718bf15f431568de6d0817d7
Satish Patel [Wed, 5 Jul 2017 23:33:23 +0000 (23:33 +0000)]
Merge "Generic Bluetooth HAL for standard Linux hci interface"
am:
6c34c8adc1
Change-Id: I0b2b523f8467b3f0cebbe96d997416baadf48cc7
Treehugger Robot [Wed, 5 Jul 2017 23:27:33 +0000 (23:27 +0000)]
Merge "Generic Bluetooth HAL for standard Linux hci interface"
Srinu Jella [Wed, 5 Jul 2017 21:43:33 +0000 (21:43 +0000)]
Dynamic blacklist device for role switch am:
942648ef5a am:
6ea73c7525
am:
4c193ebdd0
Change-Id: Id0b21f75c5bac17537bf25788a5406e279d3cc3c
Srinu Jella [Wed, 5 Jul 2017 21:41:39 +0000 (21:41 +0000)]
Dynamic blacklist device for role switch am:
942648ef5a
am:
6ea73c7525
Change-Id: I01fe791e8d95db892d890fe7e322deefb50ee266
Srinu Jella [Wed, 5 Jul 2017 21:40:42 +0000 (21:40 +0000)]
Dynamic blacklist device for role switch
am:
942648ef5a
Change-Id: I95da63d1e6cc3952e53fcdb78760b86b27e6f4a9
Satish Patel [Wed, 28 Jun 2017 01:35:19 +0000 (18:35 -0700)]
Generic Bluetooth HAL for standard Linux hci interface
This acts as common interface for bluetooth devices (including
USB ones) using the standard Linux bluetooth hci interface.
Much of this code is pulled from hardware/interface/bluetooth
and system/bt/vendor_libs/linux.
Original code used from "system/bt/vendor_libs/linux" was from:
Samuel Ortiz <sameo@linux.intel.com>
Cristian Iorga <cristian.iorga@intel.com>
Pavlin Radoslavov <pavlin@google.com>
Jakub Pawlowski <jpawlowski@google.com>
Myles Watson <mylesgw@google.com>
Orginal code taken from hardware/interface/bluetooth was
contributed by:
Myles Watson <mylesgw@google.com>
Zach Johnson <zachoverflow@google.com>
Treehugger Robot <treehugger-gerrit@google.com>
Tested:
Hikey + on board bluetooth and Hikey + USB bluetooth dongle
Change-Id: I03da10cadfae6ffb298cfccc98e3337ab7db1967
Signed-off-by: Satish Patel <satish.patel@linaro.org>
[jstultz: Migrated code back to system/bt/vendor_libs/linux/.
Included required sepolicy changes. Reworded and simplified
commit message. ]
Signed-off-by: John Stultz <john.stultz@linaro.org>
Srinu Jella [Wed, 7 Dec 2016 13:46:31 +0000 (19:16 +0530)]
Don't initiate role switch for blacklisted devices
Some devices always reject role switches and role switch
retries from the DUT may lead to A2DP glitches and LMP timeouts.
Test: manual
Bug:
33000157
Change-Id: I535a2c45ced0e14cf5530f78f3367569b306b1f4
Srinu Jella [Thu, 8 Dec 2016 13:33:20 +0000 (19:03 +0530)]
Dynamic blacklist device for role switch
- Blacklist the device if it's rejected the role switch for
max number of times. Same is added to the interop_database.
- Maximum number of failed (BTM_MAX_SW_ROLE_FAILED_ATTEMPTS)
attempts set to 3 and it is configurable.
- Same blacklisted device is referred by the BTM module when
any other module like profile is requesting for role switch
and BTM module returns BTM_REPEATED_ATTEMPTS as the switch
role status.
Test: Code compilation
Bug:
32999957
Change-Id: Ie999104a2c8ca507605ef3e1d454865cee98dcd2
Jiyong Park [Sun, 2 Jul 2017 03:48:20 +0000 (03:48 +0000)]
Merge "Add stdint.h for uint*_t types" am:
ca6aea976d am:
6f2cf2d5ef
am:
bd61770dc3
Change-Id: I7e5e4602e5a735e79b774f3315e9971a43547a41
Jiyong Park [Sun, 2 Jul 2017 03:45:50 +0000 (03:45 +0000)]
Merge "Add stdint.h for uint*_t types" am:
ca6aea976d
am:
6f2cf2d5ef
Change-Id: Iedec66633a6d4faf4c048332fe2b7e650381c59b
Jiyong Park [Sun, 2 Jul 2017 03:43:21 +0000 (03:43 +0000)]
Merge "Add stdint.h for uint*_t types"
am:
ca6aea976d
Change-Id: I6bff96fd99d2091a34ade1101350fc798e2ba574
Treehugger Robot [Sun, 2 Jul 2017 03:38:39 +0000 (03:38 +0000)]
Merge "Add stdint.h for uint*_t types"
Scott Bauer [Sat, 1 Jul 2017 01:45:43 +0000 (01:45 +0000)]
Read the correct amount of attributes am:
972c885cc9 am:
2f041ccb94
am:
a59a3fd5cb
Change-Id: I587aacad4e34d63060a474ba30524a7539d7f9c6
Scott Bauer [Sat, 1 Jul 2017 01:41:09 +0000 (01:41 +0000)]
Read the correct amount of attributes am:
972c885cc9
am:
2f041ccb94
Change-Id: I84761b2140ea4d00caabd18108938a2901ffe71c
Scott Bauer [Sat, 1 Jul 2017 01:36:40 +0000 (01:36 +0000)]
Read the correct amount of attributes
am:
972c885cc9
Change-Id: I01cb7b412650c7d0e97646539b3b86a5166f4d84
Colin Cross [Fri, 30 Jun 2017 23:04:22 +0000 (23:04 +0000)]
Merge changes from topic 'refactor_register' am:
50e621f219 am:
f993169796
am:
bc889dfa10
Change-Id: I5e242831e9623a83b29ca6208fdc71e3c7ffa2e1
Colin Cross [Fri, 30 Jun 2017 23:04:16 +0000 (23:04 +0000)]
gofmt -w build/fluoride.go am:
2cf6e71b0a am:
803867011d
am:
81eee69251
Change-Id: I9b40e7bb3afa2d807658fb488750a30979463274
Colin Cross [Fri, 30 Jun 2017 23:00:20 +0000 (23:00 +0000)]
Merge changes from topic 'refactor_register' am:
50e621f219
am:
f993169796
Change-Id: I9f4273866f68cfe108ee9a7a62d262859615ea2d
Colin Cross [Fri, 30 Jun 2017 23:00:13 +0000 (23:00 +0000)]
gofmt -w build/fluoride.go am:
2cf6e71b0a
am:
803867011d
Change-Id: Iba5dcf3f945efff4946e0a4a294eda2ff0abab7d
Colin Cross [Fri, 30 Jun 2017 22:55:44 +0000 (22:55 +0000)]
Merge changes from topic 'refactor_register'
am:
50e621f219
Change-Id: Ib9198bb482da3b67dcbeb1b517374643c14f4b45
Colin Cross [Fri, 30 Jun 2017 22:55:34 +0000 (22:55 +0000)]
gofmt -w build/fluoride.go
am:
2cf6e71b0a
Change-Id: Iaec2ee79f8930db7a75b8e8fc9c7434de0233a93
Scott Bauer [Fri, 7 Apr 2017 00:35:40 +0000 (18:35 -0600)]
Read the correct amount of attributes
bta_gattc_cache_load currently attempts to read 0xFF attributes into an
allocation sized to num_attr attributes, which can be smaller than 0xFF.
There aren't more than num_attr bytes in correct data, but this breaks
with dynamic buffer overflow checking in CopperheadOS for the read
system call since fread ends up calling read, which obtains the size of
the allocation from the malloc implementation and then aborts due to the
(potential) overflow.
This would also fail with the default enabled _FORTIFY_SOURCE=2 feature
in the Android Open Source Project if osi_malloc was marked with the
alloc_size attribute. The way it wraps malloc loses that information so
fortify checks aren't done for calls like this.
Change-Id: I68bd170d5378c9d9d21cbda376083bc0b857e15c
Signed-off-by: Scott Bauer <sbauer@plzdonthack.me>
[migrated to C++ file, added 0xFFFF limit and wrote commit message]
Signed-off-by: Daniel Micay <danielmicay@gmail.com>
Treehugger Robot [Fri, 30 Jun 2017 21:09:12 +0000 (21:09 +0000)]
Merge changes from topic 'refactor_register'
* changes:
Refactor module registration
gofmt -w build/fluoride.go
Jiyong Park [Tue, 27 Jun 2017 11:51:53 +0000 (20:51 +0900)]
Add stdint.h for uint*_t types
Mising stdint.h causes problem when building with BOARD_VNDK_VERSION,
where global include path is not provided.
Bug:
37342627
Test: BOARD_VNDK_VERSION=current m -j libbt-vendor
Change-Id: I55786baed229a3c9b4282816081a503d18a5a6f0
Nitin Arora [Fri, 30 Jun 2017 05:24:01 +0000 (05:24 +0000)]
Allow full dev consolidation after pairing am:
76eba3ad19 am:
83ac844d27
am:
b479666c2f
Change-Id: Ibf3500cb507646b21227a7f01c7d3a6e894de85d
Nitin Arora [Fri, 30 Jun 2017 05:19:02 +0000 (05:19 +0000)]
Allow full dev consolidation after pairing am:
76eba3ad19
am:
83ac844d27
Change-Id: I4bbb594c4b0a49d7954bedd5dd1b21f5db9b6012
Nitin Arora [Fri, 30 Jun 2017 05:14:00 +0000 (05:14 +0000)]
Allow full dev consolidation after pairing
am:
76eba3ad19
Change-Id: I4f118649f780a5302b69fdcfd0fc19793af730a4
Nitin Arora [Sat, 13 Aug 2016 00:48:11 +0000 (17:48 -0700)]
Allow full dev consolidation after pairing
When BR/EDR and LE RPA device records are present
in the device records and the same remote device is
paired on a new RPA, the device consolidation happens
after the IRK is received. The current consolidation
breaks out of the loop after consolidating one device
record. In such cases, BR dev record is left and when
BR link key is derived, it gets updated in a separate
device record. Since two device records are present at
the same time for the same remote, the keys and static
addresses get picked up from incorrect node and issues
such as "remove device from resolving list seen with {0}
static address" are seen.
The fix includes allowing the host to complete
the consolidation for all device records rather than
breaking at the fist match.
Change-Id: Ic8ea4b831a7ba971eb6a0f54573934a6079b45d5
Philip Cuadra [Thu, 29 Jun 2017 23:35:10 +0000 (23:35 +0000)]
Bluetooth - Add tracing for TX queue and LDAC ABR am:
c02b5d4d68 am:
2806c16cdb
am:
98b1aefd13
Change-Id: I76d64c8c318c7e342e719042ada19fd0ee04870f
Philip Cuadra [Thu, 29 Jun 2017 23:31:12 +0000 (23:31 +0000)]
Bluetooth - Add tracing for TX queue and LDAC ABR am:
c02b5d4d68
am:
2806c16cdb
Change-Id: I8bcf3bdbae3e6b6365a8f206870b8a28ddbdacb4
Philip Cuadra [Thu, 29 Jun 2017 23:27:08 +0000 (23:27 +0000)]
Bluetooth - Add tracing for TX queue and LDAC ABR
am:
c02b5d4d68
Change-Id: Id2281ab270ee6e0a0d8416ce8d8cbff689838448
Philip Cuadra [Fri, 9 Jun 2017 21:36:06 +0000 (14:36 -0700)]
Bluetooth - Add tracing for TX queue and LDAC ABR
For debugging, add tracing to show the length of the TX queue and the
LDAC ABR level.
Test: Ran bluetooth, took a systrace
Change-Id: Ia23764d68f27ae8209e37c4a0836852d73cf6cbc
Jakub Pawlowski [Thu, 29 Jun 2017 07:17:26 +0000 (07:17 +0000)]
Rename bt_bdaddr_t into RawAddress (3/3) am:
a484a88819 am:
813e468382
am:
435c1ac6ef
Change-Id: If90f030955296456af64a5d07ac2dede7a9cec51
Jakub Pawlowski [Thu, 29 Jun 2017 07:12:54 +0000 (07:12 +0000)]
Rename bt_bdaddr_t into RawAddress (3/3) am:
a484a88819
am:
813e468382
Change-Id: If7b503d36c834a9a025c4a5f50509f73e0270ee1
Jakub Pawlowski [Thu, 29 Jun 2017 07:09:30 +0000 (07:09 +0000)]
Rename bt_bdaddr_t into RawAddress (3/3)
am:
a484a88819
Change-Id: I43e5e71569281683c0a33000746e235391420714
Ben YoungTae Kim [Wed, 28 Jun 2017 23:05:34 +0000 (23:05 +0000)]
Set the A2DP media channel as a high priority L2CAP link
am:
78444b9246
Change-Id: If8449667cd65def655fc0d8f85167d5d7509e91c
Jakub Pawlowski [Sun, 25 Jun 2017 00:30:18 +0000 (17:30 -0700)]
Rename bt_bdaddr_t into RawAddress (3/3)
Test: compilation test
Change-Id: I4571721a0c6165a66450ee157a53d8d15bfc45d0
Jakub Pawlowski [Wed, 28 Jun 2017 21:51:00 +0000 (21:51 +0000)]
Merge "Get rid of BD_ADDR (again)" am:
abc4a993c8 am:
7e87dfbb38
am:
59331847d0
Change-Id: I75291b11a6d8e13bd4edd1b0905dd7e99c962dbe
Jakub Pawlowski [Wed, 28 Jun 2017 21:47:31 +0000 (21:47 +0000)]
Merge "Get rid of BD_ADDR (again)" am:
abc4a993c8
am:
7e87dfbb38
Change-Id: I6d5525d14483ee16981ba58e46be185ad8cc37d7
Jakub Pawlowski [Wed, 28 Jun 2017 21:44:01 +0000 (21:44 +0000)]
Merge "Get rid of BD_ADDR (again)"
am:
abc4a993c8
Change-Id: Ic4da09c13391f7b13ce3797b42188c6b9ce1289a
Treehugger Robot [Wed, 28 Jun 2017 21:36:09 +0000 (21:36 +0000)]
Merge "Get rid of BD_ADDR (again)"
Ben YoungTae Kim [Wed, 28 Jun 2017 20:30:23 +0000 (20:30 +0000)]
Set the A2DP media channel as a high priority L2CAP link am:
624ba681a6 am:
68aa3209de
am:
918cb2cf69
Change-Id: Icdf8eb444d4f564ef7955e51674b150ba9ef2df7
Ben YoungTae Kim [Wed, 28 Jun 2017 20:27:54 +0000 (20:27 +0000)]
Set the A2DP media channel as a high priority L2CAP link am:
624ba681a6
am:
68aa3209de
Change-Id: I911c1883b8438ea29fd14b4d38e4edb0c95cc1fb
Ben YoungTae Kim [Wed, 28 Jun 2017 20:23:25 +0000 (20:23 +0000)]
Set the A2DP media channel as a high priority L2CAP link
am:
624ba681a6
Change-Id: Ie43bd0c37d05bbe8ad3072a2918b4a500635bbfd
Jakub Pawlowski [Wed, 28 Jun 2017 19:04:53 +0000 (12:04 -0700)]
Get rid of BD_ADDR (again)
BD_ADDR and BD_ADDR_LEN were defined multiple times. Get rid of the
redefiniton.
Test: compilation test
Change-Id: Ib6e922ce88132045c13ddc28d681a0f673d87407
Ben YoungTae Kim [Tue, 20 Jun 2017 13:56:08 +0000 (19:26 +0530)]
Set the A2DP media channel as a high priority L2CAP link
Use dynamic ACL buffer allocation for high priority links:
1. Ensure dedicated ACL buffers for high priority links
2. Adjust buffer allocation if the priority of the link changes
Test: Manually tested with 4 HID devices and A2DP streaming scenario
Bug:
30787081
Change-Id: Id3c4a76e360aee322e9f8073bd399807e7987990
(cherry picked from commit
624ba681a63fa5ecf778b0b019735359654c6dd0)
Ben YoungTae Kim [Tue, 20 Jun 2017 13:56:08 +0000 (19:26 +0530)]
Set the A2DP media channel as a high priority L2CAP link
Use dynamic ACL buffer allocation for high priority links:
1. Ensure dedicated ACL buffers for high priority links
2. Adjust buffer allocation if the priority of the link changes
Test: Manually tested with 4 HID devices and A2DP streaming scenario
Bug:
30787081
Change-Id: Id3c4a76e360aee322e9f8073bd399807e7987990
Jakub Pawlowski [Wed, 28 Jun 2017 01:59:47 +0000 (01:59 +0000)]
LE State simplification am:
5e43c8035c am:
f61bb914f7
am:
08e60e4ffe
Change-Id: I4e19cbab802c318b8ea093eaf98de8a9f4764ffb
Jakub Pawlowski [Wed, 28 Jun 2017 01:56:46 +0000 (01:56 +0000)]
LE State simplification am:
5e43c8035c
am:
f61bb914f7
Change-Id: Iba5a2455a8cc4000cc954947d81122b10b2561a4
Jakub Pawlowski [Wed, 28 Jun 2017 01:53:15 +0000 (01:53 +0000)]
LE State simplification
am:
5e43c8035c
Change-Id: I61a1cad20efa6eba7ba737458850c0b985eb3725
Jakub Pawlowski [Tue, 27 Jun 2017 00:22:35 +0000 (17:22 -0700)]
LE State simplification
Test: sl4a GattReadTest
Change-Id: I53d9b9a25f39b06e3593311ed9af5b1df10637ed
Marie Janssen [Tue, 27 Jun 2017 23:06:34 +0000 (23:06 +0000)]
Merge "Fix a inappropriate return of local var address" am:
7aefc01942 am:
fa67212c82
am:
92619e3731
Change-Id: I9293204adf48ca274f370355d5f0b205e4054985
Marie Janssen [Tue, 27 Jun 2017 23:03:34 +0000 (23:03 +0000)]
Merge "Fix a inappropriate return of local var address" am:
7aefc01942
am:
fa67212c82
Change-Id: Ibc425fd3cb5976ff09dfb8535b0f964ffb3cd908
Marie Janssen [Tue, 27 Jun 2017 23:00:35 +0000 (23:00 +0000)]
Merge "Fix a inappropriate return of local var address"
am:
7aefc01942
Change-Id: I6adc54b4d905322e865ea8e455f52c3a2012b944
Marie Janssen [Tue, 27 Jun 2017 22:51:08 +0000 (22:51 +0000)]
Merge "Fix a inappropriate return of local var address"
Jakub Pawlowski [Tue, 27 Jun 2017 22:09:01 +0000 (22:09 +0000)]
HCI feature/command support check simplification am:
ec9f2f5ed0 am:
643ded0d3e
am:
a5b73565bb
Change-Id: If7521b5ee74b93bbee2c7285d626085a750758f6
Jakub Pawlowski [Tue, 27 Jun 2017 22:06:34 +0000 (22:06 +0000)]
HCI feature/command support check simplification am:
ec9f2f5ed0
am:
643ded0d3e
Change-Id: I4f4d091b47cb3b89c779e95500af2d774f0af900
Jakub Pawlowski [Tue, 27 Jun 2017 22:03:30 +0000 (22:03 +0000)]
HCI feature/command support check simplification
am:
ec9f2f5ed0
Change-Id: I64cf6631447711660567cfdb8e65ee3f6572ebfd
liuchao [Fri, 5 May 2017 03:04:33 +0000 (11:04 +0800)]
Fix a inappropriate return of local var address
Local variable address is returned through giving to
"p_db->p_attrs", which needs to be available after
returned from the function.
Test: mm -j8
Change-Id: I68744d0c925e3ea384a07ad6491fe831d59ee2fd
Jakub Pawlowski [Mon, 26 Jun 2017 20:06:17 +0000 (13:06 -0700)]
HCI feature/command support check simplification
Don't use one-time long constants
Test: compilation test
Change-Id: Iaab8039269215b44608193290de4d140e1399e66
Colin Cross [Tue, 27 Jun 2017 18:05:21 +0000 (11:05 -0700)]
Refactor module registration
Refactor module registration so that it doesn't need to separately
track properties.
Test: builds, no change to out/soong/build.ninja
Change-Id: I4215b710a37f53ea1d5664bb0f7abbd42d25a3e9
Colin Cross [Tue, 27 Jun 2017 18:15:25 +0000 (11:15 -0700)]
gofmt -w build/fluoride.go
Test: builds
Change-Id: I158eff9274c97eb59e4e3a63a39d0d5df501cee4
Jakub Pawlowski [Tue, 27 Jun 2017 00:39:19 +0000 (00:39 +0000)]
Don't send the LE Set Privacy Mode command if it's not supported am:
ba78601034 am:
6406a97f03
am:
0a61ac490e
Change-Id: I06924f5e58db8c14e22aece46ce95d94101b15a9
Jakub Pawlowski [Tue, 27 Jun 2017 00:37:44 +0000 (00:37 +0000)]
Don't send the LE Set Privacy Mode command if it's not supported am:
ba78601034
am:
6406a97f03
Change-Id: I91d5ee36013b5f5cd4e423cbb24129a6fb7adafd
Jakub Pawlowski [Tue, 27 Jun 2017 00:36:09 +0000 (00:36 +0000)]
Don't send the LE Set Privacy Mode command if it's not supported
am:
ba78601034
Change-Id: I18bcdfd58af00a6557871bee702b1ce8ad3bbe0e
Jakub Pawlowski [Mon, 26 Jun 2017 18:26:46 +0000 (11:26 -0700)]
Don't send the LE Set Privacy Mode command if it's not supported
LE Set Privacy Mode is currently guarded by LE Privacy feature, which is
enabled on some 4.x controllers, that don't support LE Set Privcay Mode
that was added in 5.0 spec.
Bug:
62809491
Test: Turn Bluetooth on/off with Angler (4.x) and check for
Set Privacy Mode
Change-Id: Ie9a164d98558db2e1fe76d90eb6ab93e4cec89d0
Marie Janssen [Mon, 26 Jun 2017 22:17:05 +0000 (22:17 +0000)]
btif: Pass UIDs changed up to the Java layer am:
57e508f56b am:
974a28d314
am:
518bc1d6d0
Change-Id: Idca4a6dc0f3a6c4be2d8f3f307e45303e6ee9c8d
Jakub Pawlowski [Mon, 26 Jun 2017 22:16:26 +0000 (22:16 +0000)]
bluetoothtbd common library reconfiguration am:
5f88533feb am:
c92a438ce6
am:
68686fdf0b
Change-Id: Ic221965f96c35bf5890c322fbb3657f1de0e3265
Marie Janssen [Mon, 26 Jun 2017 22:13:20 +0000 (22:13 +0000)]
btif: Pass UIDs changed up to the Java layer am:
57e508f56b
am:
974a28d314
Change-Id: I2ee1d8383819964df3c63216eb5958f1519dac38
Jakub Pawlowski [Mon, 26 Jun 2017 22:12:32 +0000 (22:12 +0000)]
bluetoothtbd common library reconfiguration am:
5f88533feb
am:
c92a438ce6
Change-Id: Ic2c06819487ee07ca5efa74e960d3a0c4ae2308d
Marie Janssen [Mon, 26 Jun 2017 22:01:14 +0000 (22:01 +0000)]
btif: Pass UIDs changed up to the Java layer
am:
57e508f56b
Change-Id: I0db73b5801afe6b72a438c0728273775cb14684b
Jakub Pawlowski [Mon, 26 Jun 2017 22:00:26 +0000 (22:00 +0000)]
bluetoothtbd common library reconfiguration
am:
5f88533feb
Change-Id: I98a21c91355737f09c348f90098640870b507699
Marie Janssen [Fri, 23 Jun 2017 00:21:10 +0000 (17:21 -0700)]
btif: Pass UIDs changed up to the Java layer
Previously we were simply responding with an INTERIM response and
leaving it at that.
Test: connect to BMW kit and check that interim is sent from Java
Bug:
62775732
Change-Id: Idb7de4417438f0c9697ee5c838b511cdd2223e80
Jakub Pawlowski [Sat, 24 Jun 2017 22:25:07 +0000 (15:25 -0700)]
bluetoothtbd common library reconfiguration
This patch change how code in service/common directory is compiled. Up
till now, .cc files were generated from .aidl, and the .cc files were
build for each target that used them. From now on, static lib is build
from .aidl and .cc files, and it is included into all targets that
require them.
This reduces build steps from around 1240 to 849.
Test: compilation test
Change-Id: Iebaf0c75497bc435dcc013be09a1f82e75547aa3
Android Build Merger (Role) [Fri, 23 Jun 2017 20:07:17 +0000 (20:07 +0000)]
Merge "btif: Pass UIDs changed up to the Java layer am:
39f664e629 am:
1fb2b0651e" into oc-dr1-dev-plus-aosp
Marie Janssen [Fri, 23 Jun 2017 20:07:09 +0000 (20:07 +0000)]
btif: Pass UIDs changed up to the Java layer am:
39f664e629
am:
1fb2b0651e
Change-Id: I19759d67ab34e40e6bd0f708ecef098d8b18de6c
Marie Janssen [Fri, 23 Jun 2017 20:07:05 +0000 (20:07 +0000)]
btif: Pass UIDs changed up to the Java layer am:
39f664e629
am:
7b6864ba40
Change-Id: Ib73e93221de8e6682f364fe42da5065311774287
Marie Janssen [Fri, 23 Jun 2017 20:01:37 +0000 (20:01 +0000)]
btif: Pass UIDs changed up to the Java layer
am:
39f664e629
Change-Id: I7d53647e60644bd52cdc53ccaf22e8e726a6e4c5
Marie Janssen [Fri, 23 Jun 2017 20:01:35 +0000 (20:01 +0000)]
btif: Pass UIDs changed up to the Java layer
am:
39f664e629
Change-Id: I61d182617ea69cb060fb27e26a3d3b0a24fb07c0
Jakub Pawlowski [Fri, 23 Jun 2017 16:13:30 +0000 (16:13 +0000)]
Fix crashes on stack shutdown am:
6884c4c68b am:
1a1e0fb3c7
am:
0dfa2d8363
Change-Id: Id8e498cc83984983fde5e56cd8d02fb520fae2d3
Jakub Pawlowski [Fri, 23 Jun 2017 16:07:19 +0000 (16:07 +0000)]
Fix crashes on stack shutdown am:
6884c4c68b
am:
1a1e0fb3c7
Change-Id: I6f50e1ba5c8cf1cbe8389931a8892e61771e0fb3
Jakub Pawlowski [Fri, 23 Jun 2017 16:02:48 +0000 (16:02 +0000)]
Fix crashes on stack shutdown
am:
6884c4c68b
Change-Id: Id8a02f8359f6141bca21f17cf09e6a94bad87c72
Jakub Pawlowski [Thu, 22 Jun 2017 19:45:30 +0000 (12:45 -0700)]
Fix crashes on stack shutdown
During stack shutdown, Unregister would sometimes get called after the
stack is already cleaned up, and the AdvertiseManager::Get would crash
on null check assertion. Ensure that stack is initialized before
Unregister call.
Bug:
37888261
Test: none
Change-Id: I7a4bbcd24ec7d24d21d04fe842985baaac899321
Marie Janssen [Fri, 23 Jun 2017 00:21:10 +0000 (17:21 -0700)]
btif: Pass UIDs changed up to the Java layer
Previously we were simply responding with an INTERIM response and
leaving it at that.
Test: connect to BMW kit and check that interim is sent from Java
Bug:
62775732
Change-Id: Idb7de4417438f0c9697ee5c838b511cdd2223e80
(cherry picked from commit
3d7c99dc6db3f2a0392a0b273140eb03e0050ee5)
Jacky Cheung [Fri, 23 Jun 2017 02:54:37 +0000 (02:54 +0000)]
Fix BLE remote address resolution am:
5235a8c4cc
am:
c1149e4ff1 -s ours
Change-Id: I316c99d05b724eb9dedbeaa310cd21b7224da442
Jacky Cheung [Fri, 23 Jun 2017 02:54:20 +0000 (02:54 +0000)]
Fix BLE remote address resolution am:
5235a8c4cc -s ours
am:
51e20db88f -s ours
Change-Id: Ifcb8d994edc578ae3a372b3823cbf28790bd4934
Jacky Cheung [Fri, 23 Jun 2017 02:50:50 +0000 (02:50 +0000)]
Fix BLE remote address resolution
am:
5235a8c4cc
Change-Id: I533d76ef00b9971c48347362b5092b81471e46d4
Jacky Cheung [Fri, 23 Jun 2017 02:50:49 +0000 (02:50 +0000)]
Fix BLE remote address resolution
am:
5235a8c4cc -s ours
Change-Id: Iaa3a2d1fc9a4e9d10f72c681c1cfef2ab66a3659
Jacky Cheung [Wed, 21 Jun 2017 16:44:23 +0000 (09:44 -0700)]
Fix BLE remote address resolution
The hash segment of the resolvable device address needs to be extracted
for comparison.
Bug:
62589903
Test: manual
(cherry picked from commit
7c58ca38433bc923c653c334b712fb05d25cab36)
Merged-In: I979a8ad3074b692503b0c882bd90041ba4fbfb4d
Change-Id: I5db8f266c9ee3022b2a8a882540870e5eecd0736
Andre Eisenbach [Thu, 22 Jun 2017 20:58:30 +0000 (20:58 +0000)]
Merge "resolve merge conflicts of
e292ea426 to oc-dr1-dev-plus-aosp" into oc-dr1-dev-plus-aosp
Jacky Cheung [Thu, 22 Jun 2017 20:53:39 +0000 (20:53 +0000)]
Fix BLE remote address resolution am:
7c58ca3843 am:
ca1e1b224f
am:
6a2f69286d
Change-Id: I8c0dedffcc2c5b5f660456358497574017910736
Jacky Cheung [Thu, 22 Jun 2017 20:38:40 +0000 (20:38 +0000)]
Fix BLE remote address resolution am:
7c58ca3843
am:
ca1e1b224f
Change-Id: I13b56d630b446658df12498dc89dd4d545258e0c
Jacky Cheung [Thu, 22 Jun 2017 20:31:50 +0000 (20:31 +0000)]
Fix BLE remote address resolution
am:
7c58ca3843
Change-Id: I55b2929fb6474df3341e3489d44d93e84988c230
Andre Eisenbach [Thu, 22 Jun 2017 19:54:13 +0000 (12:54 -0700)]
resolve merge conflicts of
e292ea426 to oc-dr1-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I29048592904335a98857bac252b8143d67cb29ce