OSDN Git Service
Pulkit Bhuwalka [Wed, 27 Sep 2017 20:19:07 +0000 (20:19 +0000)]
Merge "Modify Bluetooth Class of Device from Android stack" am:
d98dac4396 am:
7820d2eed0
am:
867f881ab7
Change-Id: I7ffeb551e32b1c3e9b2ce328f9215c75fc9248ca
Pulkit Bhuwalka [Wed, 27 Sep 2017 20:12:34 +0000 (20:12 +0000)]
Merge "Modify Bluetooth Class of Device from Android stack" am:
d98dac4396
am:
7820d2eed0
Change-Id: Ib013e5346fc424821acbdd9c5fa92390dbda98e8
Pulkit Bhuwalka [Wed, 27 Sep 2017 20:04:43 +0000 (20:04 +0000)]
Merge "Modify Bluetooth Class of Device from Android stack"
am:
d98dac4396
Change-Id: Ie7bb897b534f65503cd626c6c958a16e6b3a7209
Treehugger Robot [Wed, 27 Sep 2017 19:43:18 +0000 (19:43 +0000)]
Merge "Modify Bluetooth Class of Device from Android stack"
Jakub Pawlowski [Wed, 27 Sep 2017 19:14:11 +0000 (19:14 +0000)]
Merge "Fix GATT Characteristic discovery (server side)" am:
1c0dae6145 am:
ea6c79daf4
am:
5a3a19cad1
Change-Id: I118a4623988c733d4fcf8a24f7f0aba8321fbe10
Jakub Pawlowski [Wed, 27 Sep 2017 19:07:04 +0000 (19:07 +0000)]
Merge "Fix GATT Characteristic discovery (server side)" am:
1c0dae6145
am:
ea6c79daf4
Change-Id: I47feedd93dc1fd46eb7af73031a124e8f63063ad
Jakub Pawlowski [Wed, 27 Sep 2017 18:59:07 +0000 (18:59 +0000)]
Merge "Fix GATT Characteristic discovery (server side)"
am:
1c0dae6145
Change-Id: Ic0dc0eb7f321db75fd0bfc90bff9423a7b1147c0
Treehugger Robot [Wed, 27 Sep 2017 18:55:30 +0000 (18:55 +0000)]
Merge "Fix GATT Characteristic discovery (server side)"
Myles Watson [Wed, 27 Sep 2017 17:38:13 +0000 (17:38 +0000)]
Remove casts to unions to avoid unaligned accesses am:
8d749047a0 am:
30f8ab74d9
am:
ce3d8acb20
Change-Id: I59b8c04b7e596187ae68a381e99bafa526655c6f
Myles Watson [Wed, 27 Sep 2017 17:33:18 +0000 (17:33 +0000)]
Remove casts to unions to avoid unaligned accesses am:
8d749047a0
am:
30f8ab74d9
Change-Id: I8dfedd6b52d2ebf638b7d7c222510fdd4ad70938
Myles Watson [Wed, 27 Sep 2017 17:28:19 +0000 (17:28 +0000)]
Remove casts to unions to avoid unaligned accesses
am:
8d749047a0
Change-Id: Ib7bd6211720191bcc0dcbfeb2dcb5495fb55cad8
Jakub Pawlowski [Wed, 27 Sep 2017 16:58:46 +0000 (09:58 -0700)]
Fix GATT Characteristic discovery (server side)
The pointer was not properly incremented, which resulted in trashes
being sent during GATT discovery.
This issue was introduced in commit
819e2ecb84a22d6e03ec9ed67b3260c0dd7e8aba (Use one type for UUID)
Bug:
66912853
Test: sl4a GATT read test
Change-Id: Ib57ad050ff17852f9b2fec9c51cad246235e3e80
Pulkit Bhuwalka [Thu, 14 Sep 2017 02:25:31 +0000 (19:25 -0700)]
Modify Bluetooth Class of Device from Android stack
Adds ability to modify Bluetooth Class of Device from Android stack by
hooking into existing functions to modify adapter properties. This
ensures the hardware HAL bluetooth.h interface does not have to change.
Bug:
36015415
Test: Modified Class of Device using sample app and verified device icon
change when discovering from a remote device.
Change-Id: Ib5f05741480a27431afea882d071ded4a6b1bdb8
Myles Watson [Tue, 19 Sep 2017 17:01:28 +0000 (10:01 -0700)]
Remove casts to unions to avoid unaligned accesses
Bug:
65392204
Test: sanity
Change-Id: I2886cc02289b68710e83147ba4d7715a32a4fc55
Jakub Pawlowski [Tue, 26 Sep 2017 23:22:04 +0000 (23:22 +0000)]
Remove unnecesary BTA redefinitions for GATT part 4 am:
50ba9031b4 am:
f7fe18a4b7
am:
9b35ab4a2a
Change-Id: Ife17dc7d2cd1c2a0eb325281609018d76d9b8aee
Jakub Pawlowski [Tue, 26 Sep 2017 23:21:27 +0000 (23:21 +0000)]
Remove unnecesary BTA redefinitions for GATT part 3 am:
ee9a11f903 am:
1006851a6a
am:
6d31f6fd5e
Change-Id: I1f4b5db9c1febcc2f8765dc7bca6f6a47ad48b82
Jakub Pawlowski [Tue, 26 Sep 2017 23:21:21 +0000 (23:21 +0000)]
Remove unnecesary BTA redefinitions for GATT part 2 am:
e9ef00c3fb am:
3041f65216
am:
a9d89618e5
Change-Id: I51145d18580da274fc12723c7ee4b0686b7eff1a
Jakub Pawlowski [Tue, 26 Sep 2017 23:19:27 +0000 (23:19 +0000)]
Remove unnecesary BTA redefinitions for GATT part 1 am:
ab7a368f3f am:
336f58333f
am:
4a2e2b8e11
Change-Id: Ic303352e76284dc6c61c691b177c8fc9cfe344ec
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
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
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
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
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
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
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
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
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
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
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
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
Jakub Pawlowski [Tue, 26 Sep 2017 11:09:37 +0000 (11:09 +0000)]
Build fix after UUID refactor for stage branch am:
30be4b9f9c am:
23da4b4420
am:
89bfb4a560
Change-Id: Ie4c6b71b5461df7cd8002e60709b3f71a21afa6b
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
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
Jakub Pawlowski [Tue, 26 Sep 2017 05:19:01 +0000 (22:19 -0700)]
Build fix after UUID refactor for stage branch
Change-Id: Ia01fa17ba40d315a912c391211e101a951eab562
Jakub Pawlowski [Tue, 26 Sep 2017 00:18:04 +0000 (00:18 +0000)]
resolve merge conflicts of
819e2ecb8 to stage-aosp-master am:
c7897e9511
am:
53c3f08a81
Change-Id: I099f317df07442b8521d509ca38e1c302dd98976
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
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
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
Andre Eisenbach [Fri, 22 Sep 2017 20:49:43 +0000 (20:49 +0000)]
Fix build error for AVRCP13 compat fix am:
544f7e1be9 am:
7b1e826e9c
am:
250434cc60
Change-Id: I20f4663353f1f8d075cc493cf84fb7d71245895e
Ajay Panicker [Fri, 22 Sep 2017 20:49:37 +0000 (20:49 +0000)]
Change our AVRCP capabilities if the remote device only supports 1.3 am:
c8ab11a06a am:
38cb8be9c3
am:
b29b0f7426
Change-Id: I405814b0bff7043c548593b8d4fbf5e6da0109a2
Hansong Zhang [Fri, 22 Sep 2017 20:49:14 +0000 (20:49 +0000)]
Merge "Get rid of unused _DYNAMIC_MEMORY" am:
9c268d0a54 am:
af59c61d79
am:
b643ca67e2
Change-Id: I28a199e55bb9a8195fa908d9d57d82a0ee97583c
Rob Herring [Fri, 22 Sep 2017 20:48:50 +0000 (20:48 +0000)]
Merge "btlinux: Fix sepolicy for split policy (Treble) builds" am:
f0c8830387 am:
7c47e41e49
am:
bd80d30361
Change-Id: Ifb78928ccdc74bbf6336718de470890eb3f3fce8
Android Build Merger (Role) [Fri, 22 Sep 2017 20:32:40 +0000 (20:32 +0000)]
Merge changes from topic "am-
73ab4f4f5b79426a99be694e8e30b578" into oc-mr1-dev-plus-aosp
* changes:
Change our AVRCP capabilities if the remote device only supports 1.3 am:
6575e1630d am:
0011bff064 am:
a6cc2eb63f
Bluetooth: Add AVRCP 1.3 as a developer option for AVRCP version (2/2) am:
11b4d12b95 am:
7e0f03fc0a -s ours am:
def725c471
Don't reject notifications and wait until new addressed player is ready (2/2) am:
b72a002756 am:
951f1a3a1b am:
916b5a2184
Ajay Panicker [Fri, 22 Sep 2017 20:29:00 +0000 (20:29 +0000)]
Change our AVRCP capabilities if the remote device only supports 1.3 am:
6575e1630d am:
0011bff064
am:
a6cc2eb63f
Change-Id: I305023d36004129a6cad92f8862b541b276fe5df
Ajay Panicker [Fri, 22 Sep 2017 20:28:54 +0000 (20:28 +0000)]
Bluetooth: Add AVRCP 1.3 as a developer option for AVRCP version (2/2) am:
11b4d12b95 am:
7e0f03fc0a -s ours
am:
def725c471
Change-Id: I80e6e18bfc25841f03371ad453a0966b6bd372d4
Ajay Panicker [Fri, 22 Sep 2017 20:28:49 +0000 (20:28 +0000)]
Don't reject notifications and wait until new addressed player is ready (2/2) am:
b72a002756 am:
951f1a3a1b
am:
916b5a2184
Change-Id: I82bdea1bed72fefcb356240ea86d46774f6ed0b9
Andre Eisenbach [Fri, 22 Sep 2017 20:26:18 +0000 (20:26 +0000)]
Fix build error for AVRCP13 compat fix am:
544f7e1be9 am:
7b1e826e9c
am:
3fbeb7aff7
Change-Id: I1438233901f6d9b15fd32717ea566f2153dcbd6c
Ajay Panicker [Fri, 22 Sep 2017 20:26:12 +0000 (20:26 +0000)]
Change our AVRCP capabilities if the remote device only supports 1.3 am:
c8ab11a06a am:
38cb8be9c3
am:
f59c97c20d
Change-Id: I00659188e38d5aaf847d13a79dab941fe106b755
Andre Eisenbach [Fri, 22 Sep 2017 20:19:48 +0000 (20:19 +0000)]
Fix build error for AVRCP13 compat fix am:
544f7e1be9
am:
7b1e826e9c
Change-Id: I5813e2869be1b9ef4e1e36b92a6da96a38948fd9
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
Ajay Panicker [Fri, 22 Sep 2017 20:19:43 +0000 (20:19 +0000)]
Change our AVRCP capabilities if the remote device only supports 1.3 am:
c8ab11a06a
am:
38cb8be9c3
Change-Id: I4951d1ba9a0e086b89340cf3cf00bcaf66b084ad
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
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
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
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
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
Hansong Zhang [Fri, 22 Sep 2017 19:39:05 +0000 (19:39 +0000)]
Merge "Get rid of unused _DYNAMIC_MEMORY"
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
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
Treehugger Robot [Fri, 22 Sep 2017 18:32:43 +0000 (18:32 +0000)]
Merge "btlinux: Fix sepolicy for split policy (Treble) builds"
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
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
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
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
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
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)
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
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
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
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)
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)
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)
Myles Watson [Thu, 21 Sep 2017 22:21:01 +0000 (22:21 +0000)]
GAP: Set service_id before calling gap_release_ccb am:
4c6208fd2d am:
acf7e8e1ac
am:
883ef90657
Change-Id: If82e262cedd399facdcb2f7b7d4bddab2cd74355
Myles Watson [Thu, 21 Sep 2017 22:14:58 +0000 (22:14 +0000)]
GAP: Set service_id before calling gap_release_ccb am:
4c6208fd2d am:
acf7e8e1ac
am:
77a5bf558c
Change-Id: Icb162c02341d9534ce2908271485a3dc161fe28f
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: Ie4e81653a6a05a050f2c369cafc02ff4cb41da3e
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
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
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:
65695769,
65223508
Test: BLE connection and characteristic read
Change-Id: Icf309807f02e1faa273cf9bad9c09d9221a8bbfd
(cherry picked from commit
5c5c10683e2a11162838297fc8054b15837c4f32)
(cherry picked from commit
4023c6731d5e991c6202d4e499b9dd43d642fb3c)
Pavlin Radoslavov [Wed, 20 Sep 2017 23:45:53 +0000 (23:45 +0000)]
Enable extra A2DP control log messages
am:
dd8dfc4ec5
Change-Id: Ib1ffb0a5061cbbf4d6c1a9a48a5e76d1aa9eeda6
Jakub Pawlowski [Wed, 20 Sep 2017 22:37:02 +0000 (22:37 +0000)]
Get rid of libhardware dependency in native daemon am:
8c273b3700 am:
7959aec405
am:
95cfdf98c7
Change-Id: I4905a09629e4630b28224dd5cf500132dea4bfc9
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
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
Jakub Pawlowski [Wed, 20 Sep 2017 21:57:54 +0000 (21:57 +0000)]
Loosen libhardware dependency am:
b1aa65fbb3 am:
9a586e4b53
am:
7ec2db7b26
Change-Id: I1921b8184da1298ede9a4fb1641178b24e0d1778
Jakub Pawlowski [Wed, 20 Sep 2017 21:55:23 +0000 (21:55 +0000)]
Loosen libhardware dependency am:
b1aa65fbb3
am:
9a586e4b53
Change-Id: Iec1bd55eb4515b1e58daacae7837dde66572d0c8
Jakub Pawlowski [Wed, 20 Sep 2017 21:53:23 +0000 (21:53 +0000)]
Loosen libhardware dependency
am:
b1aa65fbb3
Change-Id: Icd6842ffc2f5411c5f41c2c811b124b78796d3af
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
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
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
(cherry picked from commit
7b67302a28019468ae6df9cdb7f9085c6579b859)
Pavlin Radoslavov [Wed, 20 Sep 2017 19:51:16 +0000 (19:51 +0000)]
Enable extra A2DP control log messages am:
7b67302a28 am:
98c3a8e046
am:
de4c6da774
Change-Id: Ib988de431eb40a9913ee0e535c092662b6dc3f05
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
Pavlin Radoslavov [Wed, 20 Sep 2017 19:47:14 +0000 (19:47 +0000)]
Enable extra A2DP control log messages
am:
7b67302a28
Change-Id: I0247ee2d4e174b46df2d6c9f37b666fbe3b969f3
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
Sunny Kapdi [Tue, 19 Sep 2017 20:08:14 +0000 (20:08 +0000)]
BLE Adv RPA is not updated on first timeout am:
de1203d8cc am:
33f363e634
am:
48916870e8
Change-Id: I110e13ddf51e03890eb4748c753a87700f2b77d4
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
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
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
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>
Android Build Merger (Role) [Sat, 16 Sep 2017 15:31:08 +0000 (15:31 +0000)]
Merge changes from topic "am-
d37d37956b3e49d89a31faaa131fd1fc" into oc-mr1-dev-plus-aosp
* changes:
Fix build error for AVRCP13 compat fix am:
ab0fec08a4 -s ours am:
9e79daa051 -s ours
Change our AVRCP capabilities if the remote device only supports 1.3 am:
ff2d86ed3a -s ours am:
69bd4978f2 -s ours
Andre Eisenbach [Sat, 16 Sep 2017 15:30:13 +0000 (15:30 +0000)]
Fix build error for AVRCP13 compat fix am:
ab0fec08a4 -s ours
am:
9e79daa051 -s ours
Change-Id: Ic1b532f896c2abf5de35b5f8f80a779da698513b
Andre Eisenbach [Sat, 16 Sep 2017 15:30:12 +0000 (15:30 +0000)]
Fix build error for AVRCP13 compat fix am:
ab0fec08a4
am:
b2fbd7e3d0 -s ours
Change-Id: I48fcc51377ff162a80251aedbd77d100030c4669
OSDN Git Service
