OSDN Git Service
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 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
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
Ajay Panicker [Sat, 16 Sep 2017 15:30:08 +0000 (15:30 +0000)]
Change our AVRCP capabilities if the remote device only supports 1.3 am:
ff2d86ed3a -s ours
am:
69bd4978f2 -s ours
Change-Id: I0ad2524f46de7fe5c9298b143319b711308e35ba
Ajay Panicker [Sat, 16 Sep 2017 15:30:08 +0000 (15:30 +0000)]
Change our AVRCP capabilities if the remote device only supports 1.3 am:
ff2d86ed3a
am:
f2ea7f1799 -s ours
Change-Id: I3e19e99676645942fa16c79dbf89ec220c83bdb4
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
Andre Eisenbach [Sat, 16 Sep 2017 15:27:42 +0000 (15:27 +0000)]
Fix build error for AVRCP13 compat fix
am:
ab0fec08a4 -s ours
Change-Id: I6b0837dbb37dc51267ec5eb6955ba7c6facca53c
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
Ajay Panicker [Sat, 16 Sep 2017 15:27:37 +0000 (15:27 +0000)]
Change our AVRCP capabilities if the remote device only supports 1.3
am:
ff2d86ed3a -s ours
Change-Id: I8edbd554ec49ed2d05f747664c538a54bbad74ed
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)
Jack He [Sat, 16 Sep 2017 06:33:07 +0000 (06:33 +0000)]
Merge "Clean-up BTIF profile queue on profile shutdown" am:
643c869ca2 am:
0ee292a4d0
am:
839f75226d
Change-Id: Ie78edfdf34c4f4a79918c9a5859c6f2c58a1639c
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
Jack He [Sat, 16 Sep 2017 06:27:42 +0000 (06:27 +0000)]
DO NOT MERGE Fix unknown type issue in unit tests am:
9b4aebb1ba -s ours
am:
55e7146aa8 -s ours
Change-Id: If80dde750d1a3e38a41dd9a4d49dfcf7bb71143a
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
Jack He [Sat, 16 Sep 2017 06:27:37 +0000 (06:27 +0000)]
Clean-up BTIF profile queue on profile shutdown am:
a2d0cbc35a
am:
88e62568fb -s ours
Change-Id: I47dbb5c523b99c4b8e853bf353c29cd4c514a17c
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
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
Treehugger Robot [Sat, 16 Sep 2017 06:24:09 +0000 (06:24 +0000)]
Merge "Clean-up BTIF profile queue on profile shutdown"
Jack He [Sat, 16 Sep 2017 06:14:42 +0000 (06:14 +0000)]
DO NOT MERGE Fix unknown type issue in unit tests am:
9b4aebb1ba -s ours
am:
877bc67b60 -s ours
Change-Id: Ie4af9ab59c59fcd8b0e4362ffd6d51381a9fe18c
Jack He [Sat, 16 Sep 2017 06:14:36 +0000 (06:14 +0000)]
Clean-up BTIF profile queue on profile shutdown am:
a2d0cbc35a -s ours
am:
951eeba315 -s ours
Change-Id: I17cfff2d7983301ffa2be630a4985aa743061c94
Jack He [Sat, 16 Sep 2017 06:12:11 +0000 (06:12 +0000)]
DO NOT MERGE Fix unknown type issue in unit tests
am:
9b4aebb1ba -s ours
Change-Id: I8fe51a6c113e8dd94e7822cd45548043baddfb51
Jack He [Sat, 16 Sep 2017 06:12:05 +0000 (06:12 +0000)]
Clean-up BTIF profile queue on profile shutdown
am:
a2d0cbc35a -s ours
Change-Id: I25dae768d2fb38d1b8b0747bba8cf46300838530
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
Jack He [Sat, 16 Sep 2017 01:28:14 +0000 (01:28 +0000)]
Merge "Clean-up BTIF profile queue on profile shutdown" into oc-mr1-dev
am:
11dc2c883b
Change-Id: Iaee55739cbdb395ab6fdf37d004f2b0cd7374d68
TreeHugger Robot [Sat, 16 Sep 2017 01:24:29 +0000 (01:24 +0000)]
Merge "Clean-up BTIF profile queue on profile shutdown" into oc-mr1-dev
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)
Jakub Pawlowski [Sat, 16 Sep 2017 00:28:43 +0000 (00:28 +0000)]
SetPreferredPhy/ReadPhy callback fix am:
d08d44e09b am:
6891e6f7c8
am:
7e1effb961
Change-Id: Ide2e1fb84bcf375b0a31ba133e91ae102ae765f7
Jakub Pawlowski [Sat, 16 Sep 2017 00:26:42 +0000 (00:26 +0000)]
SetPreferredPhy/ReadPhy callback fix am:
d08d44e09b
am:
6891e6f7c8
Change-Id: I07157be624a2b5aac9dcd7862cbffa4ba19a278d
Jakub Pawlowski [Sat, 16 Sep 2017 00:24:11 +0000 (00:24 +0000)]
SetPreferredPhy/ReadPhy callback fix
am:
d08d44e09b
Change-Id: I81698e198eb7be1e4b11efb16f8c43311ed4a029
Android Build Merger (Role) [Sat, 16 Sep 2017 00:17:25 +0000 (00:17 +0000)]
Merge "Merge "Don't reject notifications and wait until new addressed player is ready (2/2)" into oc-dr1-dev am:
7fba61cf06 am:
e46b0613f6 -s ours" into oc-mr1-dev-plus-aosp
Ajay Panicker [Sat, 16 Sep 2017 00:16:48 +0000 (00:16 +0000)]
Merge "Don't reject notifications and wait until new addressed player is ready (2/2)" into oc-dr1-dev am:
7fba61cf06 -s ours
am:
4b8ab1844a -s ours
Change-Id: I2746fe0ed3cc634f21b59bc91a357f48dd0621f9
Ajay Panicker [Sat, 16 Sep 2017 00:16:48 +0000 (00:16 +0000)]
Merge "Don't reject notifications and wait until new addressed player is ready (2/2)" into oc-dr1-dev am:
7fba61cf06
am:
e46b0613f6 -s ours
Change-Id: I911c98e4b025c3f122ccd5c25d28c8bcf429a685
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
Ajay Panicker [Sat, 16 Sep 2017 00:14:14 +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 -s ours
Change-Id: Ibbe07200a10dcbd5a2aa189a4d1e95fab9912a3c
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
Android Build Merger (Role) [Fri, 15 Sep 2017 23:40:08 +0000 (23:40 +0000)]
Merge "GAP: Set service_id before calling gap_release_ccb am:
f606990828 -s ours am:
9a1b87c3bc -s ours" into oc-mr1-dev-plus-aosp
Myles Watson [Fri, 15 Sep 2017 23:39:54 +0000 (23:39 +0000)]
GAP: Set service_id before calling gap_release_ccb am:
f606990828 -s ours
am:
a8f5269b23 -s ours
Change-Id: I0e7f54c446ff22b24db2dc9e2d21b996168010f5
Myles Watson [Fri, 15 Sep 2017 23:39:52 +0000 (23:39 +0000)]
GAP: Set service_id before calling gap_release_ccb am:
f606990828 -s ours
am:
9a1b87c3bc -s ours
Change-Id: I73be3630c2664c99a9493b479a02e15869cc1c43
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
Myles Watson [Fri, 15 Sep 2017 23:37:23 +0000 (23:37 +0000)]
GAP: Set service_id before calling gap_release_ccb
am:
f606990828 -s ours
Change-Id: I5d2b91b2f343491ef4ad1654f30eab118b173a52
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
(cherry picked from commit
d366807102bce97e494e83570d757ebcb6a33b3c)
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
Merged-In: Icf309807f02e1faa273cf9bad9c09d9221a8bbfd
(cherry picked from commit
5c5c10683e2a11162838297fc8054b15837c4f32)
(cherry picked from commit
4023c6731d5e991c6202d4e499b9dd43d642fb3c)
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)
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
Jakub Pawlowski [Fri, 15 Sep 2017 20:43:40 +0000 (13:43 -0700)]
SetPreferredPhy/ReadPhy callback fix
Bug:
65746728
Test: manual
Change-Id: Ifdd8e7051c953aa1c006abecd62d1af196619d98
Myles Watson [Fri, 15 Sep 2017 19:30:14 +0000 (19:30 +0000)]
GAP: Set service_id before calling gap_release_ccb
am:
4023c6731d
Change-Id: I11dd49418bd28925f13ef94c37bb0fb2c38a84d5
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)
Myles Watson [Fri, 15 Sep 2017 03:34:41 +0000 (03:34 +0000)]
Merge "GAP: Set service_id before calling gap_release_ccb" am:
57c849d1e5 am:
237c160b0f
am:
0c187327d3
Change-Id: I3e0149a7cc1b8695123704257f1bf945c2bb51eb
Jeremy Klein [Fri, 15 Sep 2017 02:58:55 +0000 (02:58 +0000)]
Ensure that services are cleaned from the GattServer HandleMap. am:
eb215402e3 am:
04dd67f8e2
am:
a099ab188b
Change-Id: I445d85325c87c8aa67795a6771e6825df27f5ab1
Jakub Pawlowski [Fri, 15 Sep 2017 02:38:19 +0000 (02:38 +0000)]
Fix included service parsing (1/3) am:
fae9b2fae0 am:
bd349a88b8
am:
d91df3675b
Change-Id: Ib872faaabcaeeedfdf58d24bb1fa0dfd3d95d873
Jeremy Klein [Fri, 15 Sep 2017 02:26:25 +0000 (02:26 +0000)]
Ensure that services are cleaned from the GattServer HandleMap. am:
eb215402e3 am:
04dd67f8e2
am:
5d5250f9b1
Change-Id: I7a6bca21ddc0ce9ca8fcf5198d5af317421c5834
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
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
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
Treehugger Robot [Thu, 14 Sep 2017 23:45:01 +0000 (23:45 +0000)]
Merge "GAP: Set service_id before calling gap_release_ccb"
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: I12d8826369233a50bfeca51d2ae8aa8732ab35ed
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
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
Jakub Pawlowski [Thu, 14 Sep 2017 23:36:09 +0000 (23:36 +0000)]
Fix included service parsing (1/3)
am:
fae9b2fae0
Change-Id: I0c331c732ad09f3cf06ecaefbc6c5255f82f5b35
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
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)
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
Jakub Pawlowski [Thu, 14 Sep 2017 03:36:13 +0000 (03:36 +0000)]
Merge "Add Suspend/Resume for advertising" into oc-mr1-dev
am:
29fbe19168
Change-Id: Ic5a439f97f827f36969763b927f6d57a06c1e63a
Pavlin Radoslavov [Thu, 14 Sep 2017 03:35:49 +0000 (03:35 +0000)]
Merge changes from topics "bt-asan-tBTA_AV-copy-crash", "bt-bta-av-role-res-error" into oc-mr1-dev
am:
238df4bccb
Change-Id: I6998b3d071fa89976e85522ae360f9bc06401cd8
Chao Quan [Thu, 14 Sep 2017 03:35:27 +0000 (03:35 +0000)]
Merge "Fix crash during derigister GATT server" into oc-mr1-dev
am:
b93d3a28ba -s ours
Change-Id: I574217c412cceb204badafdadcaf5adf1f023975
Myles Watson [Thu, 14 Sep 2017 03:35:04 +0000 (03:35 +0000)]
btm: Clear LINK_KEY_KNOWN flag for temporary connections
am:
a6fae17164
Change-Id: I8fd7fe79edf340fc7694b16c4337b54046727c70
Jakub Pawlowski [Thu, 14 Sep 2017 00:47:52 +0000 (00:47 +0000)]
Add Suspend/Resume for advertising am:
757e9b24ed am:
577f0a8c9d
am:
aab035d79d
Change-Id: Ide4d3d2e6bb9d66dca44779d91e99823202cafaf
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
Jakub Pawlowski [Wed, 13 Sep 2017 22:44:15 +0000 (22:44 +0000)]
Add Suspend/Resume for advertising
am:
757e9b24ed
Change-Id: I11faa51795bc58831781bb229d22b35717018d6c
TreeHugger Robot [Wed, 13 Sep 2017 21:49:20 +0000 (21:49 +0000)]
Merge "Add Suspend/Resume for advertising" into oc-mr1-dev
TreeHugger Robot [Wed, 13 Sep 2017 19:30:30 +0000 (19:30 +0000)]
Merge changes from topics "bt-asan-tBTA_AV-copy-crash", "bt-bta-av-role-res-error" into oc-mr1-dev
* changes:
Fix ASAN crash inside btif_av_event_deep_copy()
Return the correct status when BTA_AV Open failed because of role switch
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
TreeHugger Robot [Wed, 13 Sep 2017 17:47:47 +0000 (17:47 +0000)]
Merge "Fix crash during derigister GATT server" into oc-mr1-dev
Chao Quan [Mon, 24 Jul 2017 11:46:53 +0000 (19:46 +0800)]
Fix crash during derigister GATT server
When deregister a gatt server, GATT_deregister
will use a loop to stop service one by one and
call std::list::erase in GATTS_StopService to
remove service info. But erase makes iterator lose
efficacy. If the iterator is operated after that,
Bluetooth will crash.
Add the iterator before erase.
Test: manual
Bug:
65632336
Change-Id: I10f9351a95ab4922553d8a77663a0212407607aa
Merged-In: I10f9351a95ab4922553d8a77663a0212407607aa
(cherry picked from commit
a5aca8f6de825252b5bb72f5d1d8ff7dd1b5247a)
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
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
(cherry picked from commit
6d07e45b9ad1ae32ffe70a0bcc7736719ba973e5)
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
(cherry picked from commit
54bdc23b0452c356204379a2ce30c78fbf213461)
Myles Watson [Tue, 12 Sep 2017 22:23:44 +0000 (22:23 +0000)]
Merge "btm: Clear LINK_KEY_KNOWN flag for temporary connections" am:
e5ed4dcc90 am:
d1bed4781d
am:
bb6c37ffb3
Change-Id: Ia3d17a8997e6dce54091b73e62850f0f226c6bfb
Pavlin Radoslavov [Tue, 12 Sep 2017 22:23:21 +0000 (22:23 +0000)]
Fix ASAN crash inside btif_av_event_deep_copy() am:
6d07e45b9a am:
b4051180e9
am:
e28cf0d62e
Change-Id: I4d57494da915671a9f110bf5e07784a9cd6b2b94
Pavlin Radoslavov [Tue, 12 Sep 2017 22:22:59 +0000 (22:22 +0000)]
Return the correct status when BTA_AV Open failed because of role switch am:
54bdc23b04 am:
d2e2f4a8c7
am:
5f61da2242
Change-Id: Id2e78dd1ddac899924ab7aa84bb6abbf33d99aeb
Kim Low [Tue, 12 Sep 2017 22:22:41 +0000 (22:22 +0000)]
Fix MAC address byte ordering in the uniq field am:
7bc0edda0f am:
ca395d2933
am:
0cf6a6be9b
Change-Id: I4202a91447f092202f437ccbb7b373f8c9b9a9ae
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
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
OSDN Git Service
