OSDN Git Service
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 [Tue, 2 Oct 2018 23:26:38 +0000 (16:26 -0700)]
HIDD: Check descriptor length and increase buffer
Since maximum descriptor length is 2048, we need to assign 2054 bytes of
buffer for another 6 bytes of data. Also added a const for maximum
descriptor length.
Bug:
113572366
Test: manual
Change-Id: Ie2b25c9e1a9f2019cbc7e6fbecbb08b643c87946
Merged-In: Ie2b25c9e1a9f2019cbc7e6fbecbb08b643c87946
Pavlin Radoslavov [Sat, 25 Aug 2018 01:45:16 +0000 (18:45 -0700)]
Run the wakelock JNI callbacks on the JNI thread
All JNI callbacks must be on the JNI thread, otherwise this could
impact the threads' operation.
Bug:
111277984
Test: A2DP streaming
Change-Id: I94fa4500aea62a574c80749e904434e46eb4e942
(cherry picked from commit
c788ad703836f6ac0f63e47b20f27b41dcce9353)
Hansong Zhang [Mon, 24 Sep 2018 22:03:09 +0000 (15:03 -0700)]
DO NOT MERGE Hearing Aid: Add JNI API for add/remove whitelist
Allow Java layer to add a hearing aid device to white list or remove
from white list
Bug:
116317072
Bug:
115365334
Test: connect to a pair with one device off
Change-Id: Iac5df8f371fb39fade4493d2da8226f026545fb3
Hansong Zhang [Thu, 27 Sep 2018 05:02:38 +0000 (22:02 -0700)]
Hearing Aid: Clean up GATT on disconnect
When user requests Disconnect(), after disconnecting GATT,
OnGattDisconnected() never cleans up GATT queue, because the
corresponding device is already removed from HearingDevices. We need to
clean up the queue before connecting the same device again. Without the
fix, sometimes ACL is connected, but the host failed to read GATT
characteristic to open COC. Also clean up connection update status
during disconnect
Bug:
116317072
Bug:
115365334
Test: connect to both devices -> disconnect -> connect, and repeat
Change-Id: I158b19b3d1f2cb2123ec554eb1ffe8c842df998e
Jakub Pawlowski [Mon, 24 Sep 2018 14:43:59 +0000 (16:43 +0200)]
Send volume just once when starting the stream.
The volume is in the Start command already, no need to send it in a
separate command.
Bug:
116317072
Bug:
116044083
Bug:
116145308
Test: play music, pause, adjust volume, start playing again, verify
playing was re-started with proper volume level.
Change-Id: I2a900b03a35670de4a265184f333517db17497d8
Merged-In: I76f4b6a9302dd84781195475de50374e9c30700f
Stanley Tng [Wed, 22 Aug 2018 21:43:57 +0000 (14:43 -0700)]
Clear connection update pending flag when disconnected
For the hearing aid profile and when we get disconnection
while there is a pending connection update, then clear the flag so that
the next connection update can proceed.
Bug:
116317072
Bug:
116044083
Bug:
112050972
Test: Manual test to check for regressions
Change-Id: I54635a680cf276cf6c9f94520943c3efa97e77ec
Merged-In: Ib7d281fa6e50e0ee7cf75b552d829e2e8d4134ba
Stanley Tng [Sat, 9 Jun 2018 00:09:00 +0000 (17:09 -0700)]
Hearing Aid: codec and connection interval switching
Added support to switch the LE Connection Interval between 10 msec and
20 msec. Uses the "persist.bluetooth.hearingaid.interval" to configure.
Bug:
116317072
Bug:
116044083
Test: Manually use hearing aid devices and switches between 10 msec and
20 msec connection interval
Bug:
79579786
Change-Id: Iec15a0c9f76afe265368fd90662ffe60a29fb27b
Merged-In: I982002ac9a41969cda5dec73332b27b3142d7426
Jakub Pawlowski [Tue, 10 Apr 2018 07:16:53 +0000 (00:16 -0700)]
Hearing Aid - codec switching
StartSendingAudio internally sets the codec to the HearingAidAudioSource.
OnDeviceAvailable callback triggers audio framework to grab codec
configuration from HearingAidAudioSource. Those calls must be made in proper
order, otherwise audio framework will grab bad codec configuration.
This patch also remove default codec configuration, and crash if codec
configuration is not done correctly.
Bug:
116317072
Bug:
116044083
Test: use hearing aid supporting 24kHz codec
Change-Id: I9419d58fa8728fc8e0f0c2d2ed8d8d741309a9a3
Merged-In: I9419d58fa8728fc8e0f0c2d2ed8d8d741309a9a3
Merged-In: I8ce09c709a9cb4e79413a99fc344dffe824bc707
TreeHugger Robot [Wed, 26 Sep 2018 00:45:04 +0000 (00:45 +0000)]
Merge "bta: Pass the correct UUID array size in bta_ag_do_disc" into pi-dev
Ugo Yu [Tue, 25 Sep 2018 04:26:29 +0000 (21:26 -0700)]
[automerger skipped] Merge "DO NOT MERGE - Check SDU lower bound before allocate p_data" into oc-dev am:
bc5bd697c9 -s ours am:
77175af80b -s ours
am:
8be1e6fac4 -s ours
Change-Id: Ic52691d8f86bce01ca6e0b42e512082cb20566d8
Ugo Yu [Tue, 25 Sep 2018 04:21:39 +0000 (21:21 -0700)]
[automerger skipped] Merge "DO NOT MERGE - Check SDU lower bound before allocate p_data" into oc-dev am:
bc5bd697c9 -s ours
am:
77175af80b -s ours
Change-Id: Ic285392e964bd2f5d20f9d38bd79725512d4ea27
Ugo Yu [Tue, 25 Sep 2018 04:10:21 +0000 (21:10 -0700)]
[automerger skipped] Merge "DO NOT MERGE - Check SDU lower bound before allocate p_data" into oc-dev
am:
bc5bd697c9 -s ours
Change-Id: I35806d7afb20585bd339bfc333769cd76559f862
TreeHugger Robot [Tue, 25 Sep 2018 03:52:21 +0000 (03:52 +0000)]
Merge "DO NOT MERGE - Check SDU lower bound before allocate p_data" into oc-dev
Ugo Yu [Sat, 22 Sep 2018 01:46:51 +0000 (18:46 -0700)]
[automerger skipped] Merge "DO NOT MERGE - Check SDU lower bound before allocate p_data" into oc-mr1-dev
am:
3298d1457d -s ours
Change-Id: Ib30226371223485479de44ac15466a4a048f9966
TreeHugger Robot [Sat, 22 Sep 2018 01:35:20 +0000 (01:35 +0000)]
Merge "DO NOT MERGE - Check SDU lower bound before allocate p_data" into oc-mr1-dev
TreeHugger Robot [Sat, 22 Sep 2018 01:00:32 +0000 (01:00 +0000)]
Merge "Check SDU lower bound before allocate p_data" into pi-dev
Ugo Yu [Fri, 21 Sep 2018 21:00:46 +0000 (14:00 -0700)]
[automerger skipped] [automerger] DO NOT MERGE - Check SDU lower bound before allocate p_data am:
87bcda81b8 am:
8e31e9abb4 am:
e51a7b9760 am:
90248f8fb3 skipped:
b3bef4683a am:
c5baf9ac24 am:
9bcb338d3d
am:
247c18200e -s ours
Change-Id: I55bc0845e682b7cf381bcd68e471c34e839bea2e
Ugo Yu [Fri, 21 Sep 2018 20:54:48 +0000 (13:54 -0700)]
[automerger] DO NOT MERGE - Check SDU lower bound before allocate p_data am:
87bcda81b8 am:
8e31e9abb4 am:
e51a7b9760 am:
90248f8fb3 skipped:
b3bef4683a am:
c5baf9ac24
am:
9bcb338d3d
Change-Id: I99df5a715a420c7b797996b7235277cb8901585a
Ugo Yu [Fri, 21 Sep 2018 20:47:18 +0000 (13:47 -0700)]
[automerger] DO NOT MERGE - Check SDU lower bound before allocate p_data am:
87bcda81b8 am:
8e31e9abb4 am:
e51a7b9760 am:
90248f8fb3 skipped:
b3bef4683a
am:
c5baf9ac24
Change-Id: Ifc64ce2a02192aa306e8716ce24098abc1d75b42
Ugo Yu [Mon, 17 Sep 2018 07:59:30 +0000 (15:59 +0800)]
DO NOT MERGE - Check SDU lower bound before allocate p_data
Bug:
112321180
Test: SL4A BleCocTest:test_coc_insecured_connection_write_ascii
Change-Id: Id0c9aa2097f0b6bdc2bb9fa9086daa9452188e1d
Merged-In: Id0c9aa2097f0b6bdc2bb9fa9086daa9452188e1d
Ugo Yu [Mon, 17 Sep 2018 07:59:30 +0000 (15:59 +0800)]
DO NOT MERGE - Check SDU lower bound before allocate p_data
Bug:
112321180
Test: SL4A BleCocTest:test_coc_insecured_connection_write_ascii
Change-Id: Id0c9aa2097f0b6bdc2bb9fa9086daa9452188e1d
Android Build Merger (Role) [Tue, 18 Sep 2018 12:50:00 +0000 (12:50 +0000)]
[automerger] DO NOT MERGE - Check SDU lower bound before allocate p_data am:
87bcda81b8 am:
8e31e9abb4 am:
e51a7b9760 am:
90248f8fb3 skipped:
b3bef4683a
Change-Id: I839953933568edcea6c43f0e0b772ae07fb7244a
Android Build Merger (Role) [Tue, 18 Sep 2018 12:49:56 +0000 (12:49 +0000)]
[automerger] DO NOT MERGE - Check SDU lower bound before allocate p_data am:
87bcda81b8 am:
8e31e9abb4 am:
e51a7b9760 am:
90248f8fb3
Change-Id: I99e2abfb378fbfba47ff55cfeb6b825b825088e8
Android Build Merger (Role) [Tue, 18 Sep 2018 12:49:52 +0000 (12:49 +0000)]
[automerger] DO NOT MERGE - Check SDU lower bound before allocate p_data am:
87bcda81b8 am:
8e31e9abb4 am:
e51a7b9760
Change-Id: I13a2cd3d213f204feb8a7dcf0430aa5a729efddd
Android Build Merger (Role) [Tue, 18 Sep 2018 12:49:49 +0000 (12:49 +0000)]
[automerger] DO NOT MERGE - Check SDU lower bound before allocate p_data am:
87bcda81b8 am:
8e31e9abb4
Change-Id: Icfc1e9961a59325a522ab4385411efe446b19ce1
Android Build Merger (Role) [Tue, 18 Sep 2018 12:49:46 +0000 (12:49 +0000)]
[automerger] DO NOT MERGE - Check SDU lower bound before allocate p_data am:
87bcda81b8
Change-Id: I51d65f4d9ddba01e86ee88b600e820af4f431415
Ugo Yu [Tue, 18 Sep 2018 12:49:22 +0000 (20:49 +0800)]
DO NOT MERGE - Check SDU lower bound before allocate p_data
Bug:
112321180
Test: SL4A BleCocTest:test_coc_insecured_connection_write_ascii
Change-Id: Id0c9aa2097f0b6bdc2bb9fa9086daa9452188e1d
Ugo Yu [Mon, 17 Sep 2018 07:59:30 +0000 (15:59 +0800)]
Check SDU lower bound before allocate p_data
Bug:
112321180
Test: SL4A BleCocTest:test_coc_insecured_connection_write_ascii
Change-Id: Id0c9aa2097f0b6bdc2bb9fa9086daa9452188e1d
Pavlin Radoslavov [Fri, 7 Sep 2018 16:34:53 +0000 (09:34 -0700)]
Merge "Check data length when parsing AVRCP vendor specific command responses" into oc-dev am:
03e6de3be8 am:
36e56d4b33
am:
e03c093530
Change-Id: I1667ad997ed993e8de3985d0f001e75ac80cb30f
Pavlin Radoslavov [Fri, 7 Sep 2018 16:34:29 +0000 (09:34 -0700)]
Merge changes from topic "bt-security-avrc_pars_vendor_rsp-length-check-nyc-dev" into oc-dev am:
a57a887b16 am:
0c13a140c9
am:
8dd01ede32
Change-Id: Id45560be71798fcb6b7a0b77987cf12e1f06d46c
Pavlin Radoslavov [Fri, 7 Sep 2018 16:33:50 +0000 (09:33 -0700)]
Merge changes from topic "bt-security-avrc_ctrl_pars_vendor_rsp-length-check-nyc-dev" into oc-dev am:
5e20d5088c am:
afc8839cea
am:
9b86fdb58e
Change-Id: Iec2d44e67ab7dbac045199fe0ffa5d5051e7528b
Pavlin Radoslavov [Fri, 7 Sep 2018 16:33:18 +0000 (09:33 -0700)]
[automerger skipped] DO NOT MERGE - Check AVRCP data length when parsing inside avrc_ctrl_pars_vendor_rsp() am:
2692408d05 am:
90d9589f1e
am:
746df692f0 -s ours
Change-Id: Iaf0899a8521801655b7e1f6e675d9e809739af06
Pavlin Radoslavov [Fri, 7 Sep 2018 16:29:33 +0000 (09:29 -0700)]
Merge "Check data length when parsing AVRCP vendor specific command responses" into oc-dev am:
03e6de3be8
am:
36e56d4b33
Change-Id: I307f9c5197f80086593eb6dad1bdf55ec9100bab
Pavlin Radoslavov [Fri, 7 Sep 2018 16:29:13 +0000 (09:29 -0700)]
Merge changes from topic "bt-security-avrc_pars_vendor_rsp-length-check-nyc-dev" into oc-dev am:
a57a887b16
am:
0c13a140c9
Change-Id: I8a8547ae34543d7055024e6c1719feaf70bab891
Pavlin Radoslavov [Fri, 7 Sep 2018 16:28:48 +0000 (09:28 -0700)]
Merge changes from topic "bt-security-avrc_ctrl_pars_vendor_rsp-length-check-nyc-dev" into oc-dev am:
5e20d5088c
am:
afc8839cea
Change-Id: I4e91709896dcb3dd45f0565048a8c51e37e75b9b
Pavlin Radoslavov [Fri, 7 Sep 2018 16:28:22 +0000 (09:28 -0700)]
DO NOT MERGE - Check AVRCP data length when parsing inside avrc_ctrl_pars_vendor_rsp() am:
2692408d05
am:
90d9589f1e
Change-Id: I22b0622f5496f5ee8e3de7d95734e0112ba6913f
Pavlin Radoslavov [Fri, 7 Sep 2018 16:26:52 +0000 (09:26 -0700)]
Merge "Check data length when parsing AVRCP vendor specific command responses" into oc-dev
am:
03e6de3be8
Change-Id: I7de02b38797b24f1daf834be934c727d442dfbe0
Pavlin Radoslavov [Fri, 7 Sep 2018 16:26:33 +0000 (09:26 -0700)]
Merge changes from topic "bt-security-avrc_pars_vendor_rsp-length-check-nyc-dev" into oc-dev
am:
a57a887b16
Change-Id: I256e6f92404d6abcb3747728f119936750303ea6
Pavlin Radoslavov [Fri, 7 Sep 2018 16:25:50 +0000 (09:25 -0700)]
Merge changes from topic "bt-security-avrc_ctrl_pars_vendor_rsp-length-check-nyc-dev" into oc-dev
am:
5e20d5088c
Change-Id: Idfef0788a3a29602adbbe0e6cedf07868794e561
Pavlin Radoslavov [Fri, 7 Sep 2018 16:25:17 +0000 (09:25 -0700)]
DO NOT MERGE - Check AVRCP data length when parsing inside avrc_ctrl_pars_vendor_rsp()
am:
2692408d05
Change-Id: I8c19a5d6eb81e758430707f203c1d75e46f8d064
TreeHugger Robot [Fri, 7 Sep 2018 16:16:26 +0000 (16:16 +0000)]
Merge "Check data length when parsing AVRCP vendor specific command responses" into oc-dev
TreeHugger Robot [Fri, 7 Sep 2018 16:16:19 +0000 (16:16 +0000)]
Merge changes from topic "bt-security-avrc_pars_vendor_rsp-length-check-nyc-dev" into nyc-mr2-dev
* changes:
[automerger] DO NOT MERGE - Check data length when parsing AVRCP vendor specific command responses am:
8148397ca2 am:
1f7ced7d2f am:
33b88d2e2f am:
81bfd4b649
[automerger] DO NOT MERGE - Check data length when parsing AVRCP vendor specific command responses am:
8148397ca2 am:
1f7ced7d2f am:
33b88d2e2f
[automerger] DO NOT MERGE - Check data length when parsing AVRCP vendor specific command responses am:
8148397ca2 am:
1f7ced7d2f
[automerger] DO NOT MERGE - Check data length when parsing AVRCP vendor specific command responses am:
8148397ca2
DO NOT MERGE - Check data length when parsing AVRCP vendor specific command responses
TreeHugger Robot [Fri, 7 Sep 2018 16:16:19 +0000 (16:16 +0000)]
Merge changes from topic "bt-security-avrc_pars_vendor_rsp-length-check-nyc-dev" into cw-f-dev
* changes:
[automerger] DO NOT MERGE - Check data length when parsing AVRCP vendor specific command responses am:
8148397ca2 am:
1f7ced7d2f am:
33b88d2e2f
[automerger] DO NOT MERGE - Check data length when parsing AVRCP vendor specific command responses am:
8148397ca2 am:
1f7ced7d2f
[automerger] DO NOT MERGE - Check data length when parsing AVRCP vendor specific command responses am:
8148397ca2
DO NOT MERGE - Check data length when parsing AVRCP vendor specific command responses
TreeHugger Robot [Fri, 7 Sep 2018 16:16:19 +0000 (16:16 +0000)]
Merge changes from topic "bt-security-avrc_pars_vendor_rsp-length-check-nyc-dev" into nyc-mr1-dev
* changes:
[automerger] DO NOT MERGE - Check data length when parsing AVRCP vendor specific command responses am:
8148397ca2 am:
1f7ced7d2f
[automerger] DO NOT MERGE - Check data length when parsing AVRCP vendor specific command responses am:
8148397ca2
DO NOT MERGE - Check data length when parsing AVRCP vendor specific command responses
TreeHugger Robot [Fri, 7 Sep 2018 16:16:19 +0000 (16:16 +0000)]
Merge changes from topic "bt-security-avrc_pars_vendor_rsp-length-check-nyc-dev" into nyc-dr1-dev
* changes:
[automerger] DO NOT MERGE - Check data length when parsing AVRCP vendor specific command responses am:
8148397ca2
DO NOT MERGE - Check data length when parsing AVRCP vendor specific command responses
TreeHugger Robot [Fri, 7 Sep 2018 16:16:19 +0000 (16:16 +0000)]
Merge "DO NOT MERGE - Check data length when parsing AVRCP vendor specific command responses" into nyc-dev
TreeHugger Robot [Fri, 7 Sep 2018 16:16:19 +0000 (16:16 +0000)]
Merge changes from topic "bt-security-avrc_pars_vendor_rsp-length-check-nyc-dev" into oc-dev
* changes:
[automerger] DO NOT MERGE - Check data length when parsing AVRCP vendor specific command responses am:
8148397ca2 am:
1f7ced7d2f am:
33b88d2e2f am:
81bfd4b649 skipped:
06c4724c91
[automerger] DO NOT MERGE - Check data length when parsing AVRCP vendor specific command responses am:
8148397ca2 am:
1f7ced7d2f am:
33b88d2e2f am:
81bfd4b649
[automerger] DO NOT MERGE - Check data length when parsing AVRCP vendor specific command responses am:
8148397ca2 am:
1f7ced7d2f am:
33b88d2e2f
[automerger] DO NOT MERGE - Check data length when parsing AVRCP vendor specific command responses am:
8148397ca2 am:
1f7ced7d2f
[automerger] DO NOT MERGE - Check data length when parsing AVRCP vendor specific command responses am:
8148397ca2
DO NOT MERGE - Check data length when parsing AVRCP vendor specific command responses
TreeHugger Robot [Fri, 7 Sep 2018 16:15:19 +0000 (16:15 +0000)]
Merge changes from topic "bt-security-avrc_ctrl_pars_vendor_rsp-length-check-nyc-dev" into oc-dev
* changes:
[automerger] DO NOT MERGE - Check AVRCP data length when parsing inside avrc_ctrl_pars_vendor_rsp() am:
b4cf8416bf am:
c0e2026eb1 am:
eb2615a683 am:
38a6087b6a skipped:
df71e4a376
[automerger] DO NOT MERGE - Check AVRCP data length when parsing inside avrc_ctrl_pars_vendor_rsp() am:
b4cf8416bf am:
c0e2026eb1 am:
eb2615a683 am:
38a6087b6a
[automerger] DO NOT MERGE - Check AVRCP data length when parsing inside avrc_ctrl_pars_vendor_rsp() am:
b4cf8416bf am:
c0e2026eb1 am:
eb2615a683
[automerger] DO NOT MERGE - Check AVRCP data length when parsing inside avrc_ctrl_pars_vendor_rsp() am:
b4cf8416bf am:
c0e2026eb1
[automerger] DO NOT MERGE - Check AVRCP data length when parsing inside avrc_ctrl_pars_vendor_rsp() am:
b4cf8416bf
DO NOT MERGE - Check AVRCP data length when parsing inside avrc_ctrl_pars_vendor_rsp()
Android Build Merger (Role) [Fri, 7 Sep 2018 04:59:55 +0000 (04:59 +0000)]
[automerger] DO NOT MERGE - Check AVRCP data length when parsing inside avrc_ctrl_pars_vendor_rsp() am:
b4cf8416bf am:
c0e2026eb1 am:
eb2615a683 am:
38a6087b6a skipped:
df71e4a376
Change-Id: Ibe7f4bec37e68cf06ba39d0c8cce02ec7ba6fb18
Android Build Merger (Role) [Fri, 7 Sep 2018 04:59:53 +0000 (04:59 +0000)]
[automerger] DO NOT MERGE - Check AVRCP data length when parsing inside avrc_ctrl_pars_vendor_rsp() am:
b4cf8416bf am:
c0e2026eb1 am:
eb2615a683 am:
38a6087b6a
Change-Id: I4663734017282372f8d93cb498b80098de609c72
Android Build Merger (Role) [Fri, 7 Sep 2018 04:59:51 +0000 (04:59 +0000)]
[automerger] DO NOT MERGE - Check AVRCP data length when parsing inside avrc_ctrl_pars_vendor_rsp() am:
b4cf8416bf am:
c0e2026eb1 am:
eb2615a683
Change-Id: I99e38ee8048be6b98e0732fb32bffba78a81ae32
Android Build Merger (Role) [Fri, 7 Sep 2018 04:59:49 +0000 (04:59 +0000)]
[automerger] DO NOT MERGE - Check AVRCP data length when parsing inside avrc_ctrl_pars_vendor_rsp() am:
b4cf8416bf am:
c0e2026eb1
Change-Id: I06ca49edef4db3a930150ba7a6b875d6727ae50d
Android Build Merger (Role) [Fri, 7 Sep 2018 04:59:47 +0000 (04:59 +0000)]
[automerger] DO NOT MERGE - Check AVRCP data length when parsing inside avrc_ctrl_pars_vendor_rsp() am:
b4cf8416bf
Change-Id: I74cd9a6ffa3096d58b11092095b82f69fc94a3b7
Pavlin Radoslavov [Thu, 6 Sep 2018 22:41:27 +0000 (15:41 -0700)]
DO NOT MERGE - Check AVRCP data length when parsing inside avrc_ctrl_pars_vendor_rsp()
Bug:
111450417
Test: PoC test program
Change-Id: Idd619e52dc7a2944d0d08af824505580e299c163
(cherry picked from commit
2692408d05bf16738284b61833649cee5d2a2233)
Android Build Merger (Role) [Fri, 7 Sep 2018 00:42:38 +0000 (00:42 +0000)]
[automerger] DO NOT MERGE - Check data length when parsing AVRCP vendor specific command responses am:
8148397ca2 am:
1f7ced7d2f am:
33b88d2e2f am:
81bfd4b649 skipped:
06c4724c91
Change-Id: I4d5ede0ba21700c7d2cfe7e35131bf3932d42ca9
Android Build Merger (Role) [Fri, 7 Sep 2018 00:42:36 +0000 (00:42 +0000)]
[automerger] DO NOT MERGE - Check data length when parsing AVRCP vendor specific command responses am:
8148397ca2 am:
1f7ced7d2f am:
33b88d2e2f am:
81bfd4b649
Change-Id: I1fd09d0eefdffd0670f217aaf2a674abc7bc829a
Android Build Merger (Role) [Fri, 7 Sep 2018 00:42:34 +0000 (00:42 +0000)]
[automerger] DO NOT MERGE - Check data length when parsing AVRCP vendor specific command responses am:
8148397ca2 am:
1f7ced7d2f am:
33b88d2e2f
Change-Id: I5848daa571ae75f229b02b4856bd9c0ae8bc809a
Android Build Merger (Role) [Fri, 7 Sep 2018 00:42:32 +0000 (00:42 +0000)]
[automerger] DO NOT MERGE - Check data length when parsing AVRCP vendor specific command responses am:
8148397ca2 am:
1f7ced7d2f
Change-Id: Ia57b0cdffd9d0db790e002679342611c036b5788
Android Build Merger (Role) [Fri, 7 Sep 2018 00:42:31 +0000 (00:42 +0000)]
[automerger] DO NOT MERGE - Check data length when parsing AVRCP vendor specific command responses am:
8148397ca2
Change-Id: I986e2bb8acf0330ef5e8caa37180a5884725c2e6
Pavlin Radoslavov [Thu, 6 Sep 2018 01:21:31 +0000 (18:21 -0700)]
DO NOT MERGE - Check data length when parsing AVRCP vendor specific command responses
Bug:
111450531
Bug:
111896861
Test: PoC test program
Change-Id: I564bee8f05efabc29383659a75e695b4da76c6aa
(cherry picked from commit
7439ea940354f65a147c4ecfce3bada49c688047)
Pavlin Radoslavov [Thu, 6 Sep 2018 22:41:27 +0000 (15:41 -0700)]
DO NOT MERGE - Check AVRCP data length when parsing inside avrc_ctrl_pars_vendor_rsp()
Bug:
111450417
Test: PoC test program
Change-Id: Idd619e52dc7a2944d0d08af824505580e299c163
Pavlin Radoslavov [Thu, 6 Sep 2018 22:41:27 +0000 (15:41 -0700)]
Check AVRCP data length when parsing inside avrc_ctrl_pars_vendor_rsp()
Bug:
111450417
Test: PoC test program
Change-Id: Idd619e52dc7a2944d0d08af824505580e299c163
(cherry picked from commit
1c14e10cac53d5a5724dcf34c5679ad8819f9442)
TreeHugger Robot [Thu, 6 Sep 2018 23:22:29 +0000 (23:22 +0000)]
Merge "HID Device: Fix OOB in register_app" into pi-dev
Myles Watson [Thu, 6 Sep 2018 17:57:47 +0000 (10:57 -0700)]
bta: Pass the correct UUID array size in bta_ag_do_disc
Bug:
113164621
Test: Connect HSP from a device to the phone
Change-Id: Iec875cd165ad1cea64c307602bb00b623967c7c7
Hansong Zhang [Wed, 5 Sep 2018 23:39:16 +0000 (16:39 -0700)]
HID Device: Fix OOB in register_app
Bug:
113037220
Bug:
113111784
Test: manual
Change-Id: I91bcd5032959458b926c479160c7e391b8de313b
Pavlin Radoslavov [Thu, 6 Sep 2018 01:21:31 +0000 (18:21 -0700)]
Check data length when parsing AVRCP vendor specific command responses
Bug:
111450531
Bug:
111896861
Test: PoC test program
Change-Id: I564bee8f05efabc29383659a75e695b4da76c6aa
Ted [Fri, 17 Aug 2018 10:49:37 +0000 (18:49 +0800)]
Fix "Disable Absolute Volume" Bluetooth develop option work
Do not report device support absolute volume while
"Disable Absolute Volume" in developer option is enabled or
the remote device is listed in the interoperability database.
Test: manually adjust volume when Disable Absolute Volume is enabled
Bug:
112193362
Change-Id: Id63a22dba0d8a871035774fc86b66d32e9225b48
Merged-In: Id63a22dba0d8a871035774fc86b66d32e9225b48
Ugo Yu [Mon, 13 Aug 2018 02:12:40 +0000 (10:12 +0800)]
Fix wrong UUID mask when doing BLE filter scan
bug:
112350218
Test: manual
Change-Id: I9e4297b936e7a7db164e7ff3bf680c43600c5bda
(cherry picked from commit
04433372392a3c50558cb96f076757472dac2cec)
Cheney Ni [Sat, 11 Aug 2018 00:56:16 +0000 (17:56 -0700)]
Merge "Add packet length checks in mca_ccb_hdl_req" into oc-dev am:
816107b1e3 am:
57cde1b147
am:
c019726c62
Change-Id: Ie0d10696cff7d8da694c96af8b224fe4d9061383
Cheney Ni [Sat, 11 Aug 2018 00:55:49 +0000 (17:55 -0700)]
[automerger skipped] Merge changes from topic "am-
dcf0c368-3f3f-440a-998e-
f94bd1924189" into oc-dev am:
1718736f85 -s ours am:
3d14101b52 -s ours
am:
02482e1edd -s ours
Change-Id: I69d112ec62826799d275e32cf5499083e84d13fe
Cheney Ni [Sat, 11 Aug 2018 00:27:54 +0000 (17:27 -0700)]
Merge "Add packet length checks in mca_ccb_hdl_req" into oc-dev am:
816107b1e3
am:
57cde1b147
Change-Id: I05d1d2af205963afcd1c6bf77c8ca097662e0fc8
Cheney Ni [Sat, 11 Aug 2018 00:27:34 +0000 (17:27 -0700)]
[automerger skipped] Merge changes from topic "am-
dcf0c368-3f3f-440a-998e-
f94bd1924189" into oc-dev am:
1718736f85 -s ours
am:
3d14101b52 -s ours
Change-Id: Iceb020184e799318eb665e19544c1c8012f2b9f9
Cheney Ni [Sat, 11 Aug 2018 00:11:43 +0000 (17:11 -0700)]
Merge "Add packet length checks in mca_ccb_hdl_req" into oc-dev
am:
816107b1e3
Change-Id: Ic37e076a0e89dc449071b6e715c1ba13034b48e8
Cheney Ni [Sat, 11 Aug 2018 00:11:22 +0000 (17:11 -0700)]
[automerger skipped] Merge changes from topic "am-
dcf0c368-3f3f-440a-998e-
f94bd1924189" into oc-dev
am:
1718736f85 -s ours
Change-Id: Id71e8b3945f0d2051c2b642c6ed83c293f5d31fb
TreeHugger Robot [Fri, 10 Aug 2018 23:29:21 +0000 (23:29 +0000)]
Merge "Add packet length checks in mca_ccb_hdl_req" into oc-dev
Cheney Ni [Fri, 10 Aug 2018 23:16:31 +0000 (16:16 -0700)]
[automerger skipped] Merge "Checks the SMP length to fix OOB read" into oc-dev am:
a0f6200e5f am:
a2d1977617
am:
4b3d08fa40 -s ours
Change-Id: I28d07e232999bdda412c4263bd23e78aff2c27d5
TreeHugger Robot [Fri, 10 Aug 2018 23:13:53 +0000 (23:13 +0000)]
Merge changes from topic "am-
dcf0c368-3f3f-440a-998e-
f94bd1924189" into nyc-mr2-dev
* changes:
[automerger] Checks the SMP length to fix OOB read am:
353faee793 am:
9343dda4d3 am:
4df8c20808 am:
4bf5cf2228
[automerger] Checks the SMP length to fix OOB read am:
353faee793 am:
9343dda4d3 am:
4df8c20808
[automerger] Checks the SMP length to fix OOB read am:
353faee793 am:
9343dda4d3
[automerger] Checks the SMP length to fix OOB read am:
353faee793
Checks the SMP length to fix OOB read
TreeHugger Robot [Fri, 10 Aug 2018 23:13:53 +0000 (23:13 +0000)]
Merge changes from topic "am-
dcf0c368-3f3f-440a-998e-
f94bd1924189" into cw-f-dev
* changes:
[automerger] Checks the SMP length to fix OOB read am:
353faee793 am:
9343dda4d3 am:
4df8c20808
[automerger] Checks the SMP length to fix OOB read am:
353faee793 am:
9343dda4d3
[automerger] Checks the SMP length to fix OOB read am:
353faee793
Checks the SMP length to fix OOB read
TreeHugger Robot [Fri, 10 Aug 2018 23:13:53 +0000 (23:13 +0000)]
Merge changes from topic "am-
dcf0c368-3f3f-440a-998e-
f94bd1924189" into nyc-mr1-dev
* changes:
[automerger] Checks the SMP length to fix OOB read am:
353faee793 am:
9343dda4d3
[automerger] Checks the SMP length to fix OOB read am:
353faee793
Checks the SMP length to fix OOB read
TreeHugger Robot [Fri, 10 Aug 2018 23:13:53 +0000 (23:13 +0000)]
Merge changes from topic "am-
dcf0c368-3f3f-440a-998e-
f94bd1924189" into nyc-dr1-dev
* changes:
[automerger] Checks the SMP length to fix OOB read am:
353faee793
Checks the SMP length to fix OOB read
TreeHugger Robot [Fri, 10 Aug 2018 23:13:53 +0000 (23:13 +0000)]
Merge "Checks the SMP length to fix OOB read" into nyc-dev
TreeHugger Robot [Fri, 10 Aug 2018 23:13:53 +0000 (23:13 +0000)]
Merge changes from topic "am-
dcf0c368-3f3f-440a-998e-
f94bd1924189" into oc-dev
* changes:
[automerger] Checks the SMP length to fix OOB read am:
353faee793 am:
9343dda4d3 am:
4df8c20808 am:
4bf5cf2228 skipped:
3d75dd009b
[automerger] Checks the SMP length to fix OOB read am:
353faee793 am:
9343dda4d3 am:
4df8c20808 am:
4bf5cf2228
[automerger] Checks the SMP length to fix OOB read am:
353faee793 am:
9343dda4d3 am:
4df8c20808
[automerger] Checks the SMP length to fix OOB read am:
353faee793 am:
9343dda4d3
[automerger] Checks the SMP length to fix OOB read am:
353faee793
Checks the SMP length to fix OOB read
Cheney Ni [Fri, 10 Aug 2018 23:12:26 +0000 (16:12 -0700)]
Merge "Checks the SMP length to fix OOB read" into oc-dev am:
a0f6200e5f
am:
a2d1977617
Change-Id: I04f3e39f4900203999ee16a30540c16698fa1100
Hansong Zhang [Fri, 10 Aug 2018 22:50:24 +0000 (22:50 +0000)]
Merge "Checks the SMP length to fix OOB read" into pi-dev
Cheney Ni [Wed, 8 Aug 2018 14:20:08 +0000 (22:20 +0800)]
Checks the SMP length to fix OOB read
Bug:
111937065
Test: manual
Change-Id: I330880a6e1671d0117845430db4076dfe1aba688
Merged-In: I330880a6e1671d0117845430db4076dfe1aba688
Cheney Ni [Fri, 10 Aug 2018 22:36:13 +0000 (15:36 -0700)]
Merge "Checks the SMP length to fix OOB read" into oc-dev
am:
a0f6200e5f
Change-Id: I878e9a56d3a8f6044fe1922711a50e09861eae08
TreeHugger Robot [Fri, 10 Aug 2018 22:20:14 +0000 (22:20 +0000)]
Merge "Checks the SMP length to fix OOB read" into oc-dev
Ugo Yu [Fri, 10 Aug 2018 22:13:33 +0000 (15:13 -0700)]
Merge "Add packet length check in smp_proc_master_id" into oc-dev am:
7390441c63 am:
039526080b
am:
9d97021204
Change-Id: I44ebb7389fa0c4603991b0e7f6aff8ed114556e9
Pavlin Radoslavov [Fri, 10 Aug 2018 22:13:08 +0000 (15:13 -0700)]
Merge "Add missing AVRCP message length checks inside avrc_msg_cback" into oc-dev am:
a33d897e8a am:
d6f875028c
am:
91f21014e1
Change-Id: If813c8360bc6f7d3e9320f4b700ea1fc41eafb3b
Ugo Yu [Fri, 10 Aug 2018 22:12:41 +0000 (15:12 -0700)]
Merge changes from topic "am-
df95a56f-528f-434c-972e-
bb492348a21a" into oc-dev am:
ab4b63e6ad am:
23d8fb31be
am:
8a49e7f22d
Change-Id: I2e94fdce6511d63f26ad680361b74bdd3a6c5ec0
Ugo Yu [Fri, 10 Aug 2018 22:11:58 +0000 (15:11 -0700)]
[automerger skipped] Merge "DO NOT MERGE Fix OOB read before buffer length check" into oc-dev am:
1503110a53 am:
26b6a7cbf4
am:
1b9264d128 -s ours
Change-Id: I7d24941f1309ddc65e60fbc84e6354e414185ba6
Chienyuan [Fri, 10 Aug 2018 22:11:43 +0000 (15:11 -0700)]
Merge "Check packet length in bta_av_proc_meta_cmd" into oc-dev am:
7e52dc116c am:
ccc3cab119
am:
4d0f5bead6
Change-Id: Ifa7a555b5a5cf8b016c7e92a832a55429e435584
Pavlin Radoslavov [Fri, 10 Aug 2018 22:11:18 +0000 (15:11 -0700)]
Merge changes from topic "bt-avrcp-check-avrc_msg_cback-nyc-dev" into oc-dev am:
3834cbd1e6 am:
abf4e82057
am:
ff19b6e112
Change-Id: I35f75a3cf59ab1bae7921241eb7825305c4ccc6e
Chienyuan [Fri, 10 Aug 2018 22:10:39 +0000 (15:10 -0700)]
Merge changes from topic "am-
c2d9879f-e9d2-44f3-9012-
53037ab580a0" into oc-dev am:
ee9315f84c am:
76ad7b5439
am:
cbfe0fff84
Change-Id: I49d299a85b3e3a00f58dadd3f8af169eab0ca7e4
Ugo Yu [Fri, 10 Aug 2018 22:10:06 +0000 (15:10 -0700)]
Merge changes from topic "am-
a988fd47-73ee-44e9-929f-
5374e8851656" into oc-dev am:
cb0cdcc7ab am:
7e719a45da
am:
52c5bfffba
Change-Id: I5b6d62d23ab555cc25a44ad302da5045247a1662
Ugo Yu [Fri, 10 Aug 2018 21:47:15 +0000 (14:47 -0700)]
Merge "Add packet length check in smp_proc_master_id" into oc-dev am:
7390441c63
am:
039526080b
Change-Id: I42e6c4c2599151607b089452cc2e25d6e5103d47
Pavlin Radoslavov [Fri, 10 Aug 2018 21:46:46 +0000 (14:46 -0700)]
Merge "Add missing AVRCP message length checks inside avrc_msg_cback" into oc-dev am:
a33d897e8a
am:
d6f875028c
Change-Id: Ic28bad0cc518cf908765980c361454c2eeb4fa6d
Ugo Yu [Fri, 10 Aug 2018 21:46:09 +0000 (14:46 -0700)]
Merge "Add packet length check in smp_proc_master_id" into oc-dev
am:
7390441c63
Change-Id: I273c233acac3bca1b37c937f8cf65b004048b451
Pavlin Radoslavov [Fri, 10 Aug 2018 21:45:45 +0000 (14:45 -0700)]
Merge "Add missing AVRCP message length checks inside avrc_msg_cback" into oc-dev
am:
a33d897e8a
Change-Id: If510886dfb48fe6c741ae6766bcb97d8fa3e482e
OSDN Git Service
