OSDN Git Service
Jakub Pawlowski [Wed, 24 Oct 2018 23:50:55 +0000 (16:50 -0700)]
service: don't use android::String16 in platform-independent code am:
7b00a3b645
am:
2271bdec11
Change-Id: I783dd519d22357427887cf8beeda32ab0350302a
Chih-Hung Hsieh [Wed, 24 Oct 2018 23:49:03 +0000 (16:49 -0700)]
Allow implicit-fallthrough warnings locally. am:
c1ae0ab3c5
am:
6115e13ec4
Change-Id: I73e5d7eb7eef8f80e7cbafc583e584273b6994fa
Jakub Pawlowski [Wed, 24 Oct 2018 23:46:57 +0000 (16:46 -0700)]
Fix errors around logging when compiling on Linux am:
e4f1378d34
am:
770e1b50c1
Change-Id: Icce095846adbc0aa3474bc74654d0113bee92eca
Jakub Pawlowski [Wed, 24 Oct 2018 22:47:43 +0000 (15:47 -0700)]
Partial fix for linux build am:
292ab25ef1
am:
17da3761e7
Change-Id: I0ffe18bbcf2105a6a6ceafca84d54e78609dba41
Bill Yi [Wed, 24 Oct 2018 21:06:57 +0000 (14:06 -0700)]
Merge pi-dr1-dev to aosp-master am:
7a2346f7a9
am:
7eb56e1387
Change-Id: I3c747d9fb3c66df71c1fe1a9b85a98e2960ce794
Jakub Pawlowski [Wed, 24 Oct 2018 07:04:51 +0000 (00:04 -0700)]
service: don't use android::String16 in platform-independent code
am:
7b00a3b645
Change-Id: Ib5846ed35cc0818aa6724685203888b7fd9496aa
Jakub Pawlowski [Tue, 23 Oct 2018 19:54:53 +0000 (21:54 +0200)]
service: don't use android::String16 in platform-independent code
Test: compile on linux with ninja
Change-Id: Iac421b43a5516418a33b8c804cfca4c777363b27
Chih-Hung Hsieh [Tue, 23 Oct 2018 21:58:28 +0000 (14:58 -0700)]
Allow implicit-fallthrough warnings locally.
am:
c1ae0ab3c5
Change-Id: I091127b9297fd5b0518219805b69a5994b97d660
Chih-Hung Hsieh [Tue, 16 Oct 2018 17:18:13 +0000 (10:18 -0700)]
Allow implicit-fallthrough warnings locally.
It will be a global error by default.
These warnings will be fixed in new refactored code.
Bug:
112564944
Bug:
116020782
Test: make checkbuild
Change-Id: I67f1170f3f7502a4243d8a5641eb471317b42cf4
Exempt-From-Owner-Approval: do not block on new warnings
Stanley Tng [Tue, 23 Oct 2018 19:22:13 +0000 (12:22 -0700)]
[automerger skipped] Fix Spurious Hearing Aid Start and Stop Cmds
am:
cac96c646f -s ours
Change-Id: Ibf50a6c68afa99b6989a2cf8070941e0570ec827
Jakub Pawlowski [Tue, 23 Oct 2018 17:21:01 +0000 (10:21 -0700)]
Fix errors around logging when compiling on Linux
am:
e4f1378d34
Change-Id: I88127a850a6eaa9cf8a390964cf89d7839d37ad8
Jakub Pawlowski [Tue, 23 Oct 2018 12:46:24 +0000 (14:46 +0200)]
Fix errors around logging when compiling on Linux
* cutils/log.h -> log/log.h
* add missing #include "log/log.h"
* add android_errorWriteWithInfoLog stub
Test: compile on linux using ninja
Change-Id: I720921a2fbf86b5ce5e2a2f691f1e769c91672b6
Jakub Pawlowski [Tue, 23 Oct 2018 14:23:18 +0000 (07:23 -0700)]
Partial fix for linux build
am:
292ab25ef1
Change-Id: I73f01e952a85b945356627c40ac941bef31bc2cc
Jakub Pawlowski [Tue, 23 Oct 2018 13:57:20 +0000 (15:57 +0200)]
Partial fix for linux build
Test: build with ninja on Linux
Change-Id: Ibb5bdde117732556b5b7f0fa6fba8a57c2912782
Bill Yi [Fri, 19 Oct 2018 21:52:03 +0000 (14:52 -0700)]
Merge pi-dr1-dev to aosp-master
am:
7a2346f7a9
Change-Id: I3f4ec71151ebc9d388a546e03428261e0d00a70c
Bill Yi [Fri, 19 Oct 2018 19:20:55 +0000 (12:20 -0700)]
Merge pi-dr1-dev to aosp-master
Change-Id: I1670051cca44a5a490b42d07ae9977b01ce093e1
Stanley Tng [Wed, 17 Oct 2018 22:12:58 +0000 (15:12 -0700)]
Fix Spurious Hearing Aid Start and Stop Cmds
Prevent the spurious Start and Stop Commands that are send to the
Hearing Aids when there is audio suspend and resume, and also connection
and disconnections.
Also, make sure that the callback for the Audio Suspend and Resume are
done in the main thread; previously, it was running in the wrong socket
thread.
Lastly, make sure that the Connection Update callback are processed
correctly; previously, we are not checking that the right connection
interval are set and taking the callbacks done by service discovery.
Test: Manual testing with Hearing Aids
Bug:
117619792
Change-Id: I33a175947b0118f0234ec6338c20ac6e7963a598
Merged-In: Ib448992fc0ba5af82c2d117dd65f1abd45d2acb6
wangfukai [Fri, 19 Oct 2018 07:04:04 +0000 (00:04 -0700)]
Merge "AVRCP:Update lidx when ACP handle exist in bta_av_rc_create" am:
a8f9164a7a
am:
3ad2b64795
Change-Id: Ieed677874d9b51eb0bfca1c62f9d05e0a4b47be3
wangfukai [Fri, 19 Oct 2018 06:46:18 +0000 (23:46 -0700)]
Fix typo in avdt_scb_by_hdl am:
da8fdc5ad3
am:
32c62f11a8
Change-Id: I7cfcd424b90e6540f2e85b8313b78c0c48595bb4
wangfukai [Fri, 19 Oct 2018 06:44:53 +0000 (23:44 -0700)]
Merge "AVRCP:Update lidx when ACP handle exist in bta_av_rc_create"
am:
a8f9164a7a
Change-Id: Idcf88f8245cda75a590a5877243eb46dc7af2504
wangfukai [Fri, 19 Oct 2018 06:30:38 +0000 (23:30 -0700)]
Fix typo in avdt_scb_by_hdl
am:
da8fdc5ad3
Change-Id: Ic9a3d2893927387011db15d1c38ee95eaf4862f8
Treehugger Robot [Fri, 19 Oct 2018 03:04:30 +0000 (03:04 +0000)]
Merge "AVRCP:Update lidx when ACP handle exist in bta_av_rc_create"
wangfukai [Wed, 17 Oct 2018 06:23:12 +0000 (14:23 +0800)]
Fix typo in avdt_scb_by_hdl
Change-Id: I15ecac0232bfeb6c97f802c79bebc7aca03ab874
Signed-off-by: wangfukai <wangfukai@huawei.com>
Stanley Tng [Wed, 17 Oct 2018 00:07:26 +0000 (17:07 -0700)]
[automerger skipped] Add more Hearing Aid Profile logs
am:
b17fcf9c98 -s ours
Change-Id: I19b1a4bc6498d5ea6812facbe7c889a0d7a3ebcd
Stanley Tng [Thu, 11 Oct 2018 01:57:29 +0000 (18:57 -0700)]
Add more Hearing Aid Profile logs
Add more logs to debug the TimeCheck timeout crash issues.
Bug:
117349352
Test: Manual run
Change-Id: I3a05ca975e41ab002e466150f3f3f28ba0f037df
(cherry picked from commit
05cc6c7e97ecebd3e031f09e74f730641423ae13)
Merged-In: I3a05ca975e41ab002e466150f3f3f28ba0f037df
Hansong Zhang [Mon, 15 Oct 2018 22:47:31 +0000 (15:47 -0700)]
[automerger skipped] Hearing Aid: Use valid COC service id
am:
45ebf6d3de -s ours
Change-Id: Ifb89a852e19ada67c7e301fa5866c2d11a702f4e
wangfukai [Mon, 15 Oct 2018 13:05:18 +0000 (21:05 +0800)]
AVRCP:Update lidx when ACP handle exist in bta_av_rc_create
Test:Pair smartphone with band and carkit, unpair band and check
Media Audio with carkit on smartphone.
Signed-off-by: wangfukai <wangfukai@huawei.com>
Change-Id: Ib913d2d52e25266e797eb896f99db593531442a7
Jakub Pawlowski [Mon, 15 Oct 2018 09:08:50 +0000 (02:08 -0700)]
Uprev libchrome to r576279 (1/multiple) am:
67f5f3725b
am:
aa701c705b
Change-Id: Ia5b6d0e40a7e1cc46da523afcae02940d9bc566c
Jakub Pawlowski [Mon, 15 Oct 2018 09:02:11 +0000 (02:02 -0700)]
Uprev libchrome to r576279 (1/multiple)
am:
67f5f3725b
Change-Id: I54fea12bed8943b15bd4940950e5fd000bbe3963
Jakub Pawlowski [Mon, 23 Jul 2018 17:00:25 +0000 (10:00 -0700)]
Uprev libchrome to r576279 (1/multiple)
This patch brings the latest and greatest features of libchrome to
android. It contains ~2600 patches.
Reason for uprev: libbluetooth want to use some of the most recent
features avaliable.
Test: libchrome_test
Change-Id: I5f8d5931b404767d3b86cb3bd8df2a05dd67a768
Merged-In: I5f8d5931b404767d3b86cb3bd8df2a05dd67a768
Jakub Pawlowski [Fri, 12 Oct 2018 19:50:15 +0000 (12:50 -0700)]
Use proper naming for Identity Address am:
8b64778bb9
am:
e654cdcb41
Change-Id: I812aa2e48ebd5b1317e6bfcb02ad1411d0154379
Jakub Pawlowski [Fri, 12 Oct 2018 19:42:41 +0000 (12:42 -0700)]
Use proper naming for Identity Address
am:
8b64778bb9
Change-Id: Ib779f549b06b39227d56d3a0e2dfb37bf76c97d7
Jakub Pawlowski [Fri, 12 Oct 2018 14:10:08 +0000 (16:10 +0200)]
Use proper naming for Identity Address
During Bonding, devices exchange "Identity Address Information", which
include Identity Address, and Identity Address Type.
Identity Address is either Public Address, or Static Random Address.
Thorugh stack, we improperly use "static" where we should use
"identity" to refer to this address.
Bug:
109827460
Test: compilation, just renamed variables.
Change-Id: Iccee1e8ae881e9b9f480e0bf05eea440a905109a
Hansong Zhang [Thu, 11 Oct 2018 01:02:49 +0000 (18:02 -0700)]
Hearing Aid: Use valid COC service id
Test: disconnect hearing aid and let remote device connect to it
Bug:
116317072
Bug:
117423102
Change-Id: Iea001d287256f4d7d9e8213ac8a4f03d78f4bbc5
Merged-In: Iea001d287256f4d7d9e8213ac8a4f03d78f4bbc5
(cherry picked from commit
0df1bffc0b4e7ae0bd855684d91492168ab2c410)
Hansong Zhang [Fri, 12 Oct 2018 17:21:42 +0000 (10:21 -0700)]
Merge "Hearing Aid: Use valid COC service id" am:
f1db18e858
am:
8eca7ee792
Change-Id: I6a236f25eab3d61e87ae88c03b9345a9dfd2aa3c
Hansong Zhang [Fri, 12 Oct 2018 17:16:55 +0000 (10:16 -0700)]
Merge "Hearing Aid: Use valid COC service id"
am:
f1db18e858
Change-Id: I1003b0240b81909eb6c7225b247d691795a28a6c
Treehugger Robot [Fri, 12 Oct 2018 17:04:56 +0000 (17:04 +0000)]
Merge "Hearing Aid: Use valid COC service id"
Jakub Pawlowski [Fri, 12 Oct 2018 08:36:48 +0000 (01:36 -0700)]
[automerger skipped] [automerger] Fix possible OOB read in process_service_search_rsp am:
b6fa6e4fff am:
8c06d18eea am:
dd2fbd1c21 am:
ea12ddddf5 skipped:
3d2f54aa0f am:
572fa878ff -s ours am:
2a054eb8de -s ours am:
2667debc95 -s ours
am:
71a55dd26e -s ours
Change-Id: Ib692d9c2ae83857bbe2159474d8ce09a32efefe4
Jakub Pawlowski [Fri, 12 Oct 2018 08:30:27 +0000 (01:30 -0700)]
[automerger skipped] [automerger] Fix possible OOB read in process_service_search_rsp am:
b6fa6e4fff am:
8c06d18eea am:
dd2fbd1c21 am:
ea12ddddf5 skipped:
3d2f54aa0f am:
572fa878ff -s ours am:
2a054eb8de -s ours
am:
2667debc95 -s ours
Change-Id: I78fb3c7fdf977297fda451bc8791c8cd007ba176
Jakub Pawlowski [Fri, 12 Oct 2018 08:24:22 +0000 (01:24 -0700)]
[automerger skipped] [automerger] Fix possible OOB read in process_service_search_rsp am:
b6fa6e4fff am:
8c06d18eea am:
dd2fbd1c21 am:
ea12ddddf5 skipped:
3d2f54aa0f am:
572fa878ff -s ours
am:
2a054eb8de -s ours
Change-Id: If61dd897dcebc9f941b8e47dc4880bc9711762e6
Jakub Pawlowski [Fri, 12 Oct 2018 08:17:07 +0000 (01:17 -0700)]
[automerger skipped] [automerger] Fix possible OOB read in process_service_search_rsp am:
b6fa6e4fff am:
8c06d18eea am:
dd2fbd1c21 am:
ea12ddddf5 skipped:
3d2f54aa0f
am:
572fa878ff -s ours
Change-Id: I85ef6f11735b1648f844a7abf46ff8606f829869
Jakub Pawlowski [Fri, 12 Oct 2018 06:56:27 +0000 (23:56 -0700)]
Fix possible OOB read am:
6e6c347e79 am:
bd361ff770 am:
58a0027263
am:
9a77457517
Change-Id: I5111a988a63bb037152ef950163eb62d83508dcf
Jakub Pawlowski [Fri, 12 Oct 2018 06:49:13 +0000 (23:49 -0700)]
Fix possible OOB read am:
6e6c347e79 am:
bd361ff770
am:
58a0027263
Change-Id: Ib2a9a31a684e09954699253b4e5ef23fe4a171f7
Jakub Pawlowski [Fri, 12 Oct 2018 06:46:03 +0000 (23:46 -0700)]
Fix possible OOB read am:
6e6c347e79
am:
bd361ff770
Change-Id: I83f0e68dbd0f6f1a521215d6b2543c23734f486f
Jakub Pawlowski [Fri, 12 Oct 2018 06:36:49 +0000 (23:36 -0700)]
Fix possible OOB read
am:
6e6c347e79
Change-Id: I9fd741af3e611ace9b3d063670751e49852d007f
Android Build Merger (Role) [Fri, 12 Oct 2018 06:34:07 +0000 (06:34 +0000)]
[automerger] Fix possible OOB read in process_service_search_rsp am:
b6fa6e4fff am:
8c06d18eea am:
dd2fbd1c21 am:
ea12ddddf5 skipped:
3d2f54aa0f
Change-Id: I694383e8c553b788926656c2ae03e8a3ca37b0ea
Hansong Zhang [Fri, 12 Oct 2018 03:48:22 +0000 (20:48 -0700)]
Merge "Add bluetooth_test_common to TEST_MAPPING" am:
6b5f3d96cc
am:
e60c6bc819
Change-Id: Iddbb6f4d0ab036af3693fe31f319326703c729d0
Hansong Zhang [Fri, 12 Oct 2018 03:45:11 +0000 (20:45 -0700)]
Merge "Add bluetooth_test_common to TEST_MAPPING"
am:
6b5f3d96cc
Change-Id: Ia6f3e4f5dbc311a8dcb376c5c004a7f7a02580ba
Treehugger Robot [Fri, 12 Oct 2018 03:34:30 +0000 (03:34 +0000)]
Merge "Add bluetooth_test_common to TEST_MAPPING"
Hansong Zhang [Fri, 12 Oct 2018 02:40:09 +0000 (19:40 -0700)]
Timer: Fix unstable test am:
466b51280b
am:
d8de7b2f0d
Change-Id: Ief4ca501118c6d40a6f1fa452fe152dde7ba30e0
Hansong Zhang [Fri, 12 Oct 2018 02:35:03 +0000 (19:35 -0700)]
Timer: Fix unstable test
am:
466b51280b
Change-Id: I5b9f2420b4663489f300d684529b4f91856b1f37
Android Build Merger (Role) [Thu, 11 Oct 2018 22:20:37 +0000 (22:20 +0000)]
[automerger] Fix possible OOB read in process_service_search_rsp am:
b6fa6e4fff am:
8c06d18eea am:
dd2fbd1c21 am:
ea12ddddf5
Change-Id: I70abf72ca237a386e3712dacae00329929efd22a
Android Build Merger (Role) [Thu, 11 Oct 2018 22:20:35 +0000 (22:20 +0000)]
[automerger] Fix possible OOB read in process_service_search_rsp am:
b6fa6e4fff am:
8c06d18eea am:
dd2fbd1c21
Change-Id: Ide25784c8161e3bf8e8bf19de71e810006a4ffd3
Android Build Merger (Role) [Thu, 11 Oct 2018 22:20:32 +0000 (22:20 +0000)]
[automerger] Fix possible OOB read in process_service_search_rsp am:
b6fa6e4fff am:
8c06d18eea
Change-Id: I489c10b25faf0f1a0725e29b9f2bd7c1d17389e2
Android Build Merger (Role) [Thu, 11 Oct 2018 22:20:29 +0000 (22:20 +0000)]
[automerger] Fix possible OOB read in process_service_search_rsp am:
b6fa6e4fff
Change-Id: Id18234fccee442ea5f2ff7ad9bcf193dd50226b3
Jakub Pawlowski [Wed, 10 Oct 2018 18:07:12 +0000 (20:07 +0200)]
Fix possible OOB read in process_service_search_rsp
Bug:
74249842
Change-Id: I0dbe43f0da1f5a8f14bcb69659752de4bd70ca98
Merged-In: I0dbe43f0da1f5a8f14bcb69659752de4bd70ca98
Jakub Pawlowski [Wed, 10 Oct 2018 17:35:37 +0000 (19:35 +0200)]
Fix possible OOB read
Bug:
74249842
Change-Id: I0dbe43f0da1f5a8f14bcb69659752de4bd70ca98
Hansong Zhang [Thu, 11 Oct 2018 21:14:31 +0000 (14:14 -0700)]
Timer: Fix unstable test
* Don't use future.wait_until()
* For cancel_period_task, verify the counter won't change after
timer is cancelled
Test: run Timer test for 5000 times
Bug:
116081383
Change-Id: Ibc99507e76180a878f417a0b4e7aba1b8adc7cb6
Hansong Zhang [Thu, 11 Oct 2018 01:02:49 +0000 (18:02 -0700)]
Hearing Aid: Use valid COC service id
Test: disconnect hearing aid and let remote device connect to it
Bug:
116317072
Bug:
117423102
Change-Id: Iea001d287256f4d7d9e8213ac8a4f03d78f4bbc5
Pavlin Radoslavov [Thu, 11 Oct 2018 18:59:45 +0000 (11:59 -0700)]
Merge "Allow AVDTP SetConfig from INIT state" am:
311738f7ec
am:
f626f69c53
Change-Id: Ia6bd8091a175d5eb2a02105ad16c9270b862d957
Pavlin Radoslavov [Thu, 11 Oct 2018 18:48:26 +0000 (11:48 -0700)]
Merge "Allow AVDTP SetConfig from INIT state"
am:
311738f7ec
Change-Id: Ia6434fdf9225a443d978b158718477642b47f5b6
Treehugger Robot [Thu, 11 Oct 2018 18:38:16 +0000 (18:38 +0000)]
Merge "Allow AVDTP SetConfig from INIT state"
Stanley Tng [Thu, 11 Oct 2018 17:49:24 +0000 (10:49 -0700)]
Merge "Add more Hearing Aid Profile logs" am:
0f14d143df
am:
d0258f8015
Change-Id: I136638804bd3dac743b142c941fd5346a8cfccbe
Stanley Tng [Thu, 11 Oct 2018 17:33:55 +0000 (10:33 -0700)]
Merge "Add more Hearing Aid Profile logs"
am:
0f14d143df
Change-Id: I7d555fa8dafa0aed8c59c32cad98eae5adceb718
Treehugger Robot [Thu, 11 Oct 2018 17:14:59 +0000 (17:14 +0000)]
Merge "Add more Hearing Aid Profile logs"
Stanley Tng [Thu, 11 Oct 2018 01:57:29 +0000 (18:57 -0700)]
Add more Hearing Aid Profile logs
Add more logs to debug the TimeCheck timeout crash issues.
Test: Manual run
Change-Id: I3a05ca975e41ab002e466150f3f3f28ba0f037df
Pavlin Radoslavov [Tue, 25 Sep 2018 01:42:53 +0000 (18:42 -0700)]
Allow AVDTP SetConfig from INIT state
This addresses AVDTP codec reconfiguration issue on the A2DP Sink side.
Apparently, the A2DP Sink rejects AVDTP Reconfig - then, after the AVDTP Close
(normal), the Sink side doesn't accept AVDTP SetConfig anymore.
If the codecs are already known to the A2DP SRC, it doesn't need the
AVDTP Discover mechanism just for the purpose of the codec reconfiguration.
Hence, we can allow SetConfig from INIT state.
Bug:
115894702
Test: Manual with switching the AAC Sample Rate in the Develop Options
Change-Id: I3b1603dc6ef344eea50383df2eddf309dec80a28
Jakub Pawlowski [Wed, 10 Oct 2018 18:59:19 +0000 (11:59 -0700)]
LE Enhanced Connection Complete: Check address types am:
26aee6db57
am:
7982804e4d
Change-Id: I27f889d4212cebc247fd705f4d8ca3ea0e0abb3e
Jakub Pawlowski [Wed, 10 Oct 2018 18:44:40 +0000 (11:44 -0700)]
LE Enhanced Connection Complete: Check address types
am:
26aee6db57
Change-Id: I396a9ebc634b66eec30310627483f25269824d79
Jakub Pawlowski [Tue, 14 Aug 2018 10:24:33 +0000 (12:24 +0200)]
LE Enhanced Connection Complete: Check address types
Only pass identity addresses to btm_identity_addr_to_random_pseudo.
Only pass random addresses into btm_ble_resolve_random_addr.
Test: bond twice to device using non-resolvable address
Change-Id: I5931e5bc89449ea4ae9b873aedfd7bbcdeef2e01
weichinweng [Tue, 9 Oct 2018 21:36:17 +0000 (14:36 -0700)]
Stop A2DP stream when shutting down A2DP source.
am:
ab4453774e
Change-Id: If4e3ce011c5993b614dfaf070dd259e25dbbf53f
weichinweng [Wed, 3 Oct 2018 07:08:54 +0000 (15:08 +0800)]
Stop A2DP stream when shutting down A2DP source.
When shutting down a2dp source,
A2DP source set StateShuttingDown state too fast cause the A2DP doesn’t stop stream.
Will try to stop A2DP when doing A2DP source end session.
Bug:
116317072
Bug:
112279820
Test: Build Pass, BT off/on when play A2DP
Change-Id: I6bfb5c235da1ff4a7e6814bae3a98ae7dd1788aa
(cherry picked from commit
cdcdca546f533b55a697abd4cedafec14fb2ff6a)
Stanley Tng [Tue, 9 Oct 2018 21:24:15 +0000 (14:24 -0700)]
Hearing Aid: use correct Data Length and MediaType
am:
06036bf60d
Change-Id: I31e22b8caaaba1d656a322e689652e83f3224fe4
Stanley Tng [Tue, 25 Sep 2018 18:15:24 +0000 (11:15 -0700)]
Hearing Aid: use correct Data Length and MediaType
Adjusted the requested data length to the BT Controller from 168 to 167.
Also, change the default media type during playback to unknown.
Bug:
116317072
Bug:
116631303
Test: Manual testing with Hearing Aids and verifying with OTA logs
Change-Id: Ic4e934729a98bef5c10ebca64093d8a192e79a01
(cherry picked from commit
51a9bba7098fea697cc3785a4d32625d35403f1d)
Ajay Panicker [Tue, 9 Oct 2018 19:24:32 +0000 (12:24 -0700)]
Merge "Add DataElementReader for SDP" am:
424e80f892
am:
0de376458f
Change-Id: Icaf2dadd9abb8e93bf704fd4abc383a1d96b3b72
Ajay Panicker [Tue, 9 Oct 2018 19:12:14 +0000 (12:12 -0700)]
Merge "Add DataElementReader for SDP"
am:
424e80f892
Change-Id: I625dabfb5d1c0cf18a58550b6ea35b902cf716e0
Ajay Panicker [Tue, 9 Oct 2018 18:53:02 +0000 (18:53 +0000)]
Merge "Add DataElementReader for SDP"
Hansong Zhang [Tue, 9 Oct 2018 02:51:07 +0000 (19:51 -0700)]
Fix Timer unittest am:
4d0a9b422d
am:
652e4d91a0
Change-Id: I00c5e2617f83eacf97e8c488914c758bd250f760
Hansong Zhang [Tue, 9 Oct 2018 02:47:01 +0000 (19:47 -0700)]
Fix Timer unittest
am:
4d0a9b422d
Change-Id: I6a96c10e941e9cb8c055f6256bdd06da423176e7
Hansong Zhang [Sun, 7 Oct 2018 20:31:01 +0000 (13:31 -0700)]
Fix Timer unittest
* Never set promise more than once
* To verify running task cannot be cancelled, make sure Cancel() is
called after callback starts
* Remove a stress test case. Sometimes there is unexpected event causing
deviation.
Test: run Timer test for 5000 times
Bug:
116081383
Change-Id: If99e4958289e9b6aaabc51b15ce4ac035a3ff1e9
Hansong Zhang [Mon, 8 Oct 2018 23:57:38 +0000 (16:57 -0700)]
Merge "Replace A2DP source osi/alarm with common/Timer" am:
82c49d533a
am:
dba0ca5648
Change-Id: I78109393be0978b047559c75240a14b9902ed646
Hansong Zhang [Mon, 8 Oct 2018 23:53:36 +0000 (16:53 -0700)]
Merge "Replace A2DP source osi/alarm with common/Timer"
am:
82c49d533a
Change-Id: I914cc4e97ba1978dfeb0af0e1e9327eb8e44bbd1
Treehugger Robot [Mon, 8 Oct 2018 23:38:02 +0000 (23:38 +0000)]
Merge "Replace A2DP source osi/alarm with common/Timer"
Hansong Zhang [Mon, 8 Oct 2018 23:33:26 +0000 (16:33 -0700)]
Merge "Move btif_state_machine to common/StateMachine" am:
062b311bc3
am:
60594a984d
Change-Id: I29998335ab874c2fa6be0018db7b14c57f6edb46
Jakub Pawlowski [Mon, 8 Oct 2018 23:18:11 +0000 (16:18 -0700)]
Merge "Fix race condition around Le Start Encryption handling." am:
f67a4f54b3
am:
c6c8c6e561
Change-Id: Ic4be975e54ff87651b37b1ba4147bc1299f9e532
Hansong Zhang [Mon, 8 Oct 2018 23:10:21 +0000 (16:10 -0700)]
Merge "Move btif_state_machine to common/StateMachine"
am:
062b311bc3
Change-Id: I2fd18ccf848c6c04af0520e1e57b023eec84b297
Jakub Pawlowski [Mon, 8 Oct 2018 23:09:40 +0000 (16:09 -0700)]
Merge "Fix race condition around Le Start Encryption handling."
am:
f67a4f54b3
Change-Id: Ic343e34c18dd0ce8ef0fdbf8a23037e3bcb24878
Treehugger Robot [Mon, 8 Oct 2018 22:34:10 +0000 (22:34 +0000)]
Merge "Move btif_state_machine to common/StateMachine"
Treehugger Robot [Mon, 8 Oct 2018 22:17:28 +0000 (22:17 +0000)]
Merge "Fix race condition around Le Start Encryption handling."
Hansong Zhang [Thu, 23 Aug 2018 22:17:10 +0000 (15:17 -0700)]
Replace A2DP source osi/alarm with common/Timer
Test: A2DP stream music
Change-Id: I4f7325b3eb3be07eca6c599c7f6f5e037b8e7a64
Jakub Pawlowski [Mon, 1 Oct 2018 11:25:11 +0000 (13:25 +0200)]
Fix race condition around Le Start Encryption handling.
When sending Le Start Encryption, it's possible that at the same exact
moment the connection was disconnected, and there is an incoming
"Disconnection Complete Event". The controller would send error 0x02
"unknown connection identifier" in such case. This can happen
sporadically when reconnecting device multiple times.
Currently, we don't handle this error code. This lead to the timeout
when waiting for "Encryption Complete", and unbonding of the device.
From now on, if 0x02 error code is returned, we'll cancel current SMP
operation, which is the "LE Start Encryption". This will stop the SMP
timer, and make sure the bond to remote device is not lost.
Test: Manual test reconnecting with HID device multiple time in a row,
causing the link drop right after connection, by removing battery, or
closing the shield box.
Bug:
113652889
Change-Id: I2ff9c13dbc8e7b71505908996e26b89fa1ea6a42
Ajay Panicker [Fri, 14 Sep 2018 22:10:13 +0000 (15:10 -0700)]
Add DataElementReader for SDP
DataElementReader extracts DataElement's from packets which are the
basic container for all data in the SDP protocol.
Bug:
114751344
Test: run host test bluetooth_test_sdp
Change-Id: If01f22d81af1b80e7c9ac8993ee161eba779bfa3
weichinweng [Mon, 8 Oct 2018 11:26:43 +0000 (04:26 -0700)]
Merge "Stop A2DP stream when shutting down A2DP source." am:
90942c06f2
am:
30eed705e5
Change-Id: Ia92bd09915113b91fdb91b967b86b82ad80e29cd
weichinweng [Mon, 8 Oct 2018 11:18:40 +0000 (04:18 -0700)]
Merge "Stop A2DP stream when shutting down A2DP source."
am:
90942c06f2
Change-Id: If18e665cdda1e69aca48cd31bc1a44d5c4d3a237
Treehugger Robot [Mon, 8 Oct 2018 11:06:32 +0000 (11:06 +0000)]
Merge "Stop A2DP stream when shutting down A2DP source."
Hansong Zhang [Fri, 5 Oct 2018 23:21:09 +0000 (16:21 -0700)]
Add bluetooth_test_common to TEST_MAPPING
Bug:
116081383
Test: unit test
Change-Id: I8231b8f168ab1d86009b7be2cf0b6044f5c8d0cf
Hansong Zhang [Fri, 5 Oct 2018 18:42:06 +0000 (11:42 -0700)]
Merge "HIDD: Check descriptor length and increase buffer" into pi-dev
am:
9499309599
Change-Id: Idbf1f9a6064b68a0579f985aecb08a5945b9086b
TreeHugger Robot [Fri, 5 Oct 2018 18:02:40 +0000 (18:02 +0000)]
Merge "HIDD: Check descriptor length and increase buffer" into pi-dev
Hansong Zhang [Thu, 4 Oct 2018 22:04:18 +0000 (15:04 -0700)]
Move btif_state_machine to common/StateMachine
In Bluetooth native infrastructure refactor plan, we need a state
machine class for entire stack
Test: manual
Change-Id: I0e6671e42570482d9a9466b117054b3aadb3e9cc
weichinweng [Wed, 3 Oct 2018 07:08:54 +0000 (15:08 +0800)]
Stop A2DP stream when shutting down A2DP source.
When shutting down a2dp source,
A2DP source set StateShuttingDown state too fast cause the A2DP doesn’t stop stream.
Will try to stop A2DP when doing A2DP source end session.
Bug:
112279820
Test: Build Pass, BT off/on when play A2DP
Change-Id: I6bfb5c235da1ff4a7e6814bae3a98ae7dd1788aa
OSDN Git Service
