OSDN Git Service
Myles Watson [Wed, 3 Apr 2019 03:52:15 +0000 (20:52 -0700)]
Merge "RootCanal: Add beacons by default"
am:
ca152a6705
Change-Id: I5dc0e3cceb7ae1cb4e4a4cb4d5e31c52a6ee6343
Treehugger Robot [Wed, 3 Apr 2019 03:40:38 +0000 (03:40 +0000)]
Merge "RootCanal: Add beacons by default"
Myles Watson [Wed, 3 Apr 2019 01:37:51 +0000 (18:37 -0700)]
Merge "packet: Add Packet classes and tests"
am:
a275910a49
Change-Id: I930470fa3921157afe771cab7f427168c89f6a95
weichinweng [Wed, 3 Apr 2019 01:36:31 +0000 (18:36 -0700)]
Add service change handle for Hearing Aids
am:
c410c2e7f1
Change-Id: I77c2bec2821d939fe8323d64ab051260bf9d57ee
Treehugger Robot [Wed, 3 Apr 2019 01:01:06 +0000 (01:01 +0000)]
Merge "packet: Add Packet classes and tests"
Myles Watson [Mon, 1 Apr 2019 20:21:25 +0000 (13:21 -0700)]
packet: Add Packet classes and tests
Test: atest bluetooth_test_gd
Change-Id: I8e124d5123cff3354f5c451b3806904a2d60b38d
weichinweng [Wed, 20 Mar 2019 10:53:11 +0000 (18:53 +0800)]
Add service change handle for Hearing Aids
When receive service changed indication from Hearing Aid (which indicates
Hearing Aid service changed), it will refresh the hearing aid attribute
handle to ensure the attribute handle is correct.
Bug:
122008481
Test: 1.run unit test
2.After Pair old version FW HearingAid, Disconnect/Reconnect new version
FW HearingAId, then check whether HearingAid is working fine.
3.After Pair old version FW HearingAid, Bluetooth off/on to reconnect
new version FW HearingAId, then check whether HearingAid is working
fine.
Change-Id: I48eae10a3016429f35f4f904752be93bb419d515
Jakub Pawlowski [Tue, 2 Apr 2019 21:22:59 +0000 (14:22 -0700)]
Fix for GATT not returning disconnect callback.
am:
8edcc90e45
Change-Id: Ib0e1bf8b76c163eafbd909d81f0137dc9a247d25
Jakub Pawlowski [Tue, 2 Apr 2019 17:21:14 +0000 (19:21 +0200)]
Fix for GATT not returning disconnect callback.
Before recent refactor GATT was using the L2CAP layer to start LE
connections. Since the refactor, GATT talks directly to added
connection_manager, just like L2CAP.
L2CAP does have it's own timer for direct connections, that was
returning conneciton failure after timeout. After switching to
connection_manager, GATT no longer receives those callbacks.
This patch makes the connection_manager send the on_connection_timed_out
callback, and wire it to same handler that L2CAP layer was using before.
Test: unit tests added
Bug:
125553095
Change-Id: Iaf8be46fe8eed49f78ddbc6a2f3516bc8279e91f
Myles Watson [Tue, 2 Apr 2019 20:57:46 +0000 (13:57 -0700)]
RootCanal: Add beacons by default
Bug:
129546852
Test: Scan for devices using RootCanal as the Bluetooth chip
Change-Id: Ia17535bffbcdde28db5120f99aad45a915f1a7ca
Jack He [Tue, 2 Apr 2019 20:57:49 +0000 (13:57 -0700)]
Merge "Common: remove GD related stuff from common"
am:
98695adc1c
Change-Id: I13d8f4c471ad366b52740f2d39faf78600e9f9a1
Treehugger Robot [Tue, 2 Apr 2019 20:07:54 +0000 (20:07 +0000)]
Merge "Common: remove GD related stuff from common"
Jack He [Mon, 1 Apr 2019 23:20:14 +0000 (16:20 -0700)]
Common: remove GD related stuff from common
* Remove reactor, thread, handler, alarm, repeating alarm from common/
since they are already copied into gd/os
* Extract thread and alarm benchmarks into gd:bluetooth_benchmark_gd
* Enable host side unit tests for system/bt in TEST_MAPPING
Bug:
129537494
Test: run benchmark, run unit tests
Change-Id: Id5d7592067bab3275976dfc710e4d751c43b9df8
Greg Kaiser [Tue, 2 Apr 2019 17:02:47 +0000 (10:02 -0700)]
Avoid using erase()d iterator
am:
120f377694
Change-Id: I5039b59eae6da98daa35581a51ed9112d9cb1d73
Greg Kaiser [Tue, 2 Apr 2019 17:02:34 +0000 (10:02 -0700)]
btif_storage: Avoid extra std::string copies
am:
709a29f9e9
Change-Id: I5867967366a9e17af8529153d7ea37f7bd78e72d
Greg Kaiser [Mon, 1 Apr 2019 13:47:23 +0000 (06:47 -0700)]
Avoid using erase()d iterator
After calling erase(it), 'it' is no longer valid and should not be
used as it was in the 'it++' of the 'for' loop. We change to
update 'it' to the result of erase(), and only perform 'it++' if
we're not erasing it.
Test: TreeHugger
Change-Id: If7889fdca76a6883aeb4341be1a6fff466585e29
Greg Kaiser [Tue, 26 Mar 2019 16:09:28 +0000 (09:09 -0700)]
btif_storage: Avoid extra std::string copies
When a function takes a const std::string reference for an
argument, it's inefficient to pass in std::string::c_str().
Test: TreeHugger
Change-Id: Ibd00c10a08ab853875fd16739bce5851f6b42639
Yi Kong [Tue, 2 Apr 2019 08:16:31 +0000 (01:16 -0700)]
Merge "Fix use of uninitialised variable"
am:
52b5f32e07
Change-Id: I315935b706a7386547caac06c8e8f981e71e7431
Yi Kong [Tue, 2 Apr 2019 08:04:02 +0000 (08:04 +0000)]
Merge "Fix use of uninitialised variable"
Hansong Zhang [Tue, 2 Apr 2019 04:23:36 +0000 (21:23 -0700)]
Merge "Disable Link layer socket device test in rootcanal"
am:
460d035101
Change-Id: Id72df7c7f5336a337575c4bc29c5f0cee15b4d53
Treehugger Robot [Tue, 2 Apr 2019 04:14:33 +0000 (04:14 +0000)]
Merge "Disable Link layer socket device test in rootcanal"
Weichin Weng [Tue, 2 Apr 2019 02:14:04 +0000 (19:14 -0700)]
[automerger skipped] Merge "Revert "DO NOT MERGE Hearing Aid: Add JNI API for add/remove whitelist""
am:
864fe7ad39 -s ours
am skip reason: subject contains skip directive
Change-Id: I5c1ff1bbe0f3c7fc665e6f89d4eabebecd26a961
Weichin Weng [Tue, 2 Apr 2019 01:48:09 +0000 (01:48 +0000)]
Merge "Revert "DO NOT MERGE Hearing Aid: Add JNI API for add/remove whitelist""
Hansong Zhang [Mon, 1 Apr 2019 23:33:52 +0000 (16:33 -0700)]
Disable Link layer socket device test in rootcanal
Test: presubmit
Bug:
129537494
Change-Id: I852da314ab65052a0e1a794f5faa9f21e1249efe
Zach Johnson [Mon, 1 Apr 2019 21:15:17 +0000 (14:15 -0700)]
Merge "Fix assert macro logical inversion"
am:
c5b38fae53
Change-Id: I1651a93c09137f8a5d159cf056d3ea3d0c115831
Zach Johnson [Mon, 1 Apr 2019 20:12:03 +0000 (20:12 +0000)]
Merge "Fix assert macro logical inversion"
Zach Johnson [Fri, 29 Mar 2019 19:45:50 +0000 (12:45 -0700)]
Fix assert macro logical inversion
Rename FATAL_WHEN to ASSERT and LOG_FATAL_WHEN to ASSERT_LOG
Test: atest
Change-Id: I0e6e15ce7cfbb89e76910181f164e8ff32abc033
weichinweng [Fri, 29 Mar 2019 06:07:52 +0000 (14:07 +0800)]
Revert "DO NOT MERGE Hearing Aid: Add JNI API for add/remove whitelist"
This reverts commit
d65f697c011cc6e5eaad767de3ec726cfd25b27f.
This CL is merge into AOSP in error due to the block copy from
pi-dev-plus-aosp
Test: run unit test
Change-Id: I9e206465e832d263084895b7c7b808df4573f986
Merged-In: Iab11567fa326b6837a621c1edc93e0eceb04ec43
Yi Kong [Fri, 29 Mar 2019 23:15:50 +0000 (16:15 -0700)]
Fix use of uninitialised variable
The fallthrough code path on L264 does not initialise the type variable
but it is used on L270.
Test: m checkbuild
Bug:
129566813
Change-Id: I18eb3b9be1712bac844aeb804ab76b218580c4b6
Hansong Zhang [Fri, 29 Mar 2019 16:20:02 +0000 (09:20 -0700)]
Merge "Fix potential null point dereference"
am:
6bb3296e5e
Change-Id: I92ba1186cf0517023faafc1251b34bc513522000
Hansong Zhang [Fri, 29 Mar 2019 15:55:25 +0000 (15:55 +0000)]
Merge "Fix potential null point dereference"
Ted Wang [Fri, 29 Mar 2019 08:20:27 +0000 (16:20 +0800)]
Fix potential null point dereference
Use find() to check element in map to avoid unknow element been insert
into map causing null point dereference.
Bug:
121310341
Test: Manual connect/disconnect headset
Change-Id: If127086ec4beb9b735ef3c72456e8e2209826b57
Zach Johnson [Fri, 29 Mar 2019 01:20:26 +0000 (18:20 -0700)]
Merge changes Ice4cee21,I6e579811,Ieae0cb21
am:
7c12a1727d
Change-Id: Ie2fd9170d55c4ef2cf2a7b7864489e37dac17e6a
Zach Johnson [Fri, 29 Mar 2019 01:15:40 +0000 (01:15 +0000)]
Merge changes Ice4cee21,I6e579811,Ieae0cb21
* changes:
RootCanal: Add more scripts
RootCanal: Desktop simulation envrionment
RootCanal: New Directory Structure
Zach Johnson [Fri, 29 Mar 2019 00:50:06 +0000 (17:50 -0700)]
Merge "Get gd os tests running on host"
am:
d4e4cc2f51
Change-Id: Icc5eb98cf87d1311b35a5730b5497a290cdace2d
Zach Johnson [Fri, 29 Mar 2019 00:37:33 +0000 (00:37 +0000)]
Merge "Get gd os tests running on host"
Hansong Zhang [Thu, 28 Mar 2019 22:02:52 +0000 (15:02 -0700)]
Merge "Run code coverage only on host target"
am:
36277fcc67
Change-Id: I8dabacad4bc7c30001a55827c8f976704a89d549
Myles Watson [Thu, 7 Feb 2019 23:21:25 +0000 (15:21 -0800)]
RootCanal: Add more scripts
Test: Connect to HCI sockets and LinkLayer sockets
Change-Id: Ice4cee21f295bbb3a3fe35cfe44073028e65d811
Myles Watson [Wed, 13 Feb 2019 20:36:32 +0000 (12:36 -0800)]
RootCanal: Desktop simulation envrionment
Test: nativetest64/root-canal/root-canal [TEST_PORT] [HCI_PORT] [LINK_PORT]
python scripts/test_channel.py
Change-Id: I6e57981182c392366d7d97249d837694b49dfa4e
Myles Watson [Fri, 18 Jan 2019 19:42:33 +0000 (11:42 -0800)]
RootCanal: New Directory Structure
model/controller/ contains the simulated chip
model/devices/ contains simulated devices
model/setup/ contains the test model
packets/link_layer/ contains the fake LMP packets
Test: cts-verifier Insecure RFCOMM test
LinkLayerPacketBuilderTest
rootcanal-packets_test_host
Change-Id: Ieae0cb21f7d57c03797f800797cedae59dd70e49
Zach Johnson [Thu, 28 Mar 2019 02:15:38 +0000 (19:15 -0700)]
Get gd os tests running on host
* Run os tests on host
* Fix flaky hander clear test
* Move to linux_generic
* Remove dependency on libchrome
* Allow alarms to run on linux host where we can't get CAP_WAKE_ALARM
Test: atest bluetooth_gd_test_os
Change-Id: Ia95ce39169ac8c963052e3252e7b39ef32bd5bb1
Treehugger Robot [Thu, 28 Mar 2019 21:42:33 +0000 (21:42 +0000)]
Merge "Run code coverage only on host target"
Hansong Zhang [Wed, 27 Mar 2019 22:49:13 +0000 (15:49 -0700)]
Run code coverage only on host target
Bug:
129421924
Test: run code coverage
Change-Id: I1dc681c72d8af29e43ccb1441ffd218059b8056c
Ray Kuo [Thu, 28 Mar 2019 16:48:48 +0000 (09:48 -0700)]
Merge "BQR: Fix for the issue that Bluetooth keeps on crashing if the controller firmware does not support the BQR feature."
am:
c19e159920
Change-Id: Ieb9dfdb35d8740114c2a94e0453de6762ef4ecc9
Treehugger Robot [Thu, 28 Mar 2019 16:37:55 +0000 (16:37 +0000)]
Merge "BQR: Fix for the issue that Bluetooth keeps on crashing if the controller firmware does not support the BQR feature."
Zach Johnson [Thu, 28 Mar 2019 03:19:58 +0000 (20:19 -0700)]
Merge "Only use the new format in gd/"
am:
8b3df83108
Change-Id: I4129cc39765902b3aec64180c814e8105ef95693
Zach Johnson [Thu, 28 Mar 2019 03:09:39 +0000 (03:09 +0000)]
Merge "Only use the new format in gd/"
Hansong Zhang [Wed, 27 Mar 2019 22:41:57 +0000 (15:41 -0700)]
Merge "Copy reactor classes to new directory"
am:
10a6432c6a
Change-Id: If973570cbc40c3110cb9a0caa63ad2c461523aa6
Treehugger Robot [Wed, 27 Mar 2019 22:32:09 +0000 (22:32 +0000)]
Merge "Copy reactor classes to new directory"
Myles Watson [Wed, 27 Mar 2019 22:26:49 +0000 (15:26 -0700)]
Only use the new format in gd/
Test: Upload a change with long lines
Change-Id: Iba4a08f9556219bfada9a13272463acbf7ddbdce
Cheney Ni [Wed, 27 Mar 2019 21:34:30 +0000 (14:34 -0700)]
Merge "A2DP: Initialize the UIPC HAL only when those binderized HALs are not enabled"
am:
2ef65b9065
Change-Id: Ic82f8948428d14e4761892ad53334b2bacdd00d3
Treehugger Robot [Wed, 27 Mar 2019 21:07:29 +0000 (21:07 +0000)]
Merge "A2DP: Initialize the UIPC HAL only when those binderized HALs are not enabled"
Hansong Zhang [Tue, 19 Mar 2019 23:17:42 +0000 (16:17 -0700)]
Copy reactor classes to new directory
Test: compile and run unit test
Change-Id: Ie704bf6b80f24bcae86d557ca351a893dcf8bdfa
Hansong Zhang [Wed, 27 Mar 2019 17:44:20 +0000 (10:44 -0700)]
Merge "Hearing aid: use new common/Timer"
am:
39eba7165c
Change-Id: I31592f1e4ea83cb41e94b50ce76c1e578dffa35c
Treehugger Robot [Wed, 27 Mar 2019 17:26:06 +0000 (17:26 +0000)]
Merge "Hearing aid: use new common/Timer"
Cheney Ni [Wed, 27 Mar 2019 12:58:49 +0000 (20:58 +0800)]
A2DP: Initialize the UIPC HAL only when those binderized HALs are not enabled
When using BluetoothA2dp / BluetoothAudio HAL, the UIPC won't be used,
and is no need to do the initialization. If it is up, there will be an
uipc-main thread running, and we have to release by the UIPC_Close API
before the A2DP source restarting. If we are acquiring a new one before
released, some of its resource will be leaked, and causes the stack
abnormal.
Bug:
128256722
Test: Check uipc-main is running when using the legacy HAL only
Change-Id: Icc8ea102d29c92b58c77099979d17e85e5cb9a83
Chienyuan [Mon, 25 Mar 2019 16:39:33 +0000 (09:39 -0700)]
Add test about post/clear task from callback for handler
am:
13369ff8d1
Change-Id: Iafc38c79a208bd37c3c9872d3e0db1f43ca21cd6
Chienyuan [Sat, 23 Mar 2019 00:12:52 +0000 (17:12 -0700)]
Add test about post/clear task from callback for handler
Test: sudo ./bluetooth_test_common
Change-Id: Ibbf8622a705d3523638ef6cc9e6a62130b877637
Hansong Zhang [Thu, 21 Mar 2019 18:21:31 +0000 (11:21 -0700)]
Hearing aid: use new common/Timer
Previously osi/alarm cannot be cancelled or freed while in a callback.
Replace it with common/Timer. It's safe to be cancelled in a callback
and well tested.
Bug:
119533256
Test: manual
Change-Id: I73c7c98d683c85ec8f0f4256c3e4bccf3e11b56a
Cheney Ni [Fri, 22 Mar 2019 07:55:34 +0000 (00:55 -0700)]
Merge "Fallback to the legacy HAL when IBluetoothAudioProvidersFactory is unsupported"
am:
86ef0c76da
Change-Id: Ie257f7cad6ed4180e8ae3ea858b52edcdbd06f72
Treehugger Robot [Fri, 22 Mar 2019 07:46:23 +0000 (07:46 +0000)]
Merge "Fallback to the legacy HAL when IBluetoothAudioProvidersFactory is unsupported"
Ray Kuo [Thu, 21 Mar 2019 09:55:47 +0000 (17:55 +0800)]
BQR: Fix for the issue that Bluetooth keeps on crashing if the
controller firmware does not support the BQR feature.
Considering for the Treble case, it might upgrade the system image
only and the BQR feature will be enabled on a device whose Bluetooth
controller firmware does not support the BQR feature. The change is
not to crash the system if the controller firmware does not handle the
BQR VSC.
Bug:
129037162
Test: Enabled the BQR feature on the device whose Bluetooth controller
firmware does not support the BQR feature. The Bluetooth can be turned
on and works normally.
Change-Id: I6e9310a2b604679ba300e558ae4482887501e022
Cheney Ni [Thu, 21 Mar 2019 02:10:50 +0000 (19:10 -0700)]
Merge "Refine the log messages of audio_bluetooth_hal"
am:
cb7b7e432f
Change-Id: If20d0574941b1a3d24119d24b862e30d571ede90
Cheney Ni [Thu, 21 Mar 2019 02:10:18 +0000 (19:10 -0700)]
Merge "Add a workaround to play A2DP SBC Mono"
am:
532316c0ae
Change-Id: Ic7f2a1442ede61a7720f2e7c25cda02efc551411
Treehugger Robot [Thu, 21 Mar 2019 02:03:49 +0000 (02:03 +0000)]
Merge "Refine the log messages of audio_bluetooth_hal"
Treehugger Robot [Thu, 21 Mar 2019 02:03:11 +0000 (02:03 +0000)]
Merge "Add a workaround to play A2DP SBC Mono"
Jack He [Thu, 21 Mar 2019 00:46:39 +0000 (17:46 -0700)]
Merge "Add event_value to BluetoothClassicPairingEventReported"
am:
a0060ceed6
Change-Id: I9d2823e129b28fc2b59c788a8245018d07226679
Treehugger Robot [Thu, 21 Mar 2019 00:33:08 +0000 (00:33 +0000)]
Merge "Add event_value to BluetoothClassicPairingEventReported"
Elliott Hughes [Wed, 20 Mar 2019 19:52:40 +0000 (12:52 -0700)]
Merge "Use PLOG rather than LOG strerror(errno)."
am:
fa450772a8
Change-Id: I4fa20e7921ba336ddc866e3596e1f1e602eea5d6
Elliott Hughes [Wed, 20 Mar 2019 19:41:28 +0000 (19:41 +0000)]
Merge "Use PLOG rather than LOG strerror(errno)."
Cheney Ni [Wed, 20 Mar 2019 11:53:35 +0000 (19:53 +0800)]
Refine the log messages of audio_bluetooth_hal
This CL follows the review suggestions at aosp/920718 and aosp/925233 to
refine logs.
Bug: none
Test: check logs manually
Change-Id: I3c57afaf6d416752687a7a697a310fe98c8ee495
Cheney Ni [Mon, 11 Mar 2019 12:49:11 +0000 (20:49 +0800)]
Add a workaround to play A2DP SBC Mono
There is a similar WAR of aosp/522661 at A2DP legacy HAL. In order to
suport MONO channel mode, the PCM audio is pulled as STEREO and mixed
into MONO by the Bluetooth Audio HAL.
Test: Playing SBC mono with Headset
Bug:
127593318
Change-Id: I78f3973ba6c8c733dc18122288a915daed97be65
Jack He [Wed, 20 Mar 2019 11:04:36 +0000 (04:04 -0700)]
Add event_value to BluetoothClassicPairingEventReported
* Add an event_value field to log status value such as
- encryption enabled state
- simple pairing mode
- secure connection host support
- delete all flag
* Use the event_value field to log above information during
classic pairing process instead
Bug:
128966402
Test: make
Change-Id: I2a87c3837754bfc5bcd55f72325400c428c2ca25
Stanley Tng [Mon, 18 Mar 2019 20:34:55 +0000 (13:34 -0700)]
Add Rx RSSI logs for Hearing Aids
am:
10c80b5ce2
Change-Id: I1bbded7fff9ddf1c4d1bb637df1d86d565371d07
Cheney Ni [Thu, 14 Mar 2019 12:58:59 +0000 (20:58 +0800)]
Fallback to the legacy HAL when IBluetoothAudioProvidersFactory is unsupported
Because the stack may run without the new BluetoothAudio HAL like GSI
under old devices, it will be nullptr to getService from the
IBluetoothAudioProvidersFactory in such condition. We take nullptr as
unsupported, and fallback to the legacy HAL.
Bug:
128419724
Test: Manually running A2DP and hearing aid with / without the HAL
Change-Id: I606abc3e5b63b7857c3307c879fd4cbe46dd05d9
Stanley Tng [Mon, 25 Feb 2019 20:05:22 +0000 (12:05 -0800)]
Add Rx RSSI logs for Hearing Aids
When there is a data buffer flush (which indicates data congestion),
the received RSSI will be queried for this connection multiple times and
logged in the dumpsys.
Bug:
124331686
Test: Manual test
Change-Id: I686f4e34bda3f8067b42d6b41ca8bf316a5bf6f1
Elliott Hughes [Fri, 15 Mar 2019 03:22:17 +0000 (20:22 -0700)]
Use PLOG rather than LOG strerror(errno).
Test: builds
Change-Id: I75c3311ce00fccc79b8efc198ce69ffed96e805a
Jorge Moreira Broche [Thu, 14 Mar 2019 20:35:43 +0000 (13:35 -0700)]
Merge "Allow to disable the rootcanal test console with a property"
am:
ddd6a6f7c0
Change-Id: Id29f2fbec572e3cbab7273a8223caf7394414add
Jorge Moreira Broche [Thu, 14 Mar 2019 20:19:03 +0000 (20:19 +0000)]
Merge "Allow to disable the rootcanal test console with a property"
Cheney Ni [Thu, 14 Mar 2019 18:24:59 +0000 (11:24 -0700)]
Merge "No need to abort the audio HAL / Bluetooth when failed to suspend"
am:
0cc83418b1
Change-Id: Ia71c87eb6fe33267eee4339d759ee96edaf3ee0a
Treehugger Robot [Thu, 14 Mar 2019 18:08:12 +0000 (18:08 +0000)]
Merge "No need to abort the audio HAL / Bluetooth when failed to suspend"
Jorge E. Moreira [Thu, 14 Mar 2019 04:05:39 +0000 (21:05 -0700)]
Merge "Move controller_properties.json to the vendor image"
am:
6f80399e14
Change-Id: I0810d6c2249370828dd442b8c953932902d01dbf
Treehugger Robot [Thu, 14 Mar 2019 03:51:30 +0000 (03:51 +0000)]
Merge "Move controller_properties.json to the vendor image"
Nick Kralevich [Wed, 13 Mar 2019 18:36:12 +0000 (11:36 -0700)]
Merge "compiler based array initialization"
am:
e9220762b0
Change-Id: I03324d9d61a934dc142153f6e64b0f7d9aca53cd
Nick Kralevich [Wed, 13 Mar 2019 18:24:59 +0000 (18:24 +0000)]
Merge "compiler based array initialization"
Joseph Pirozzo [Wed, 13 Mar 2019 16:15:07 +0000 (09:15 -0700)]
Merge "Recover from HandsFree client connection collision"
am:
3081c2e81a
Change-Id: I9cddf7fc2a827b20f18393ff62d1cb3fd0032320
Joseph Pirozzo [Wed, 13 Mar 2019 16:04:19 +0000 (16:04 +0000)]
Merge "Recover from HandsFree client connection collision"
Cheney Ni [Thu, 7 Mar 2019 06:15:27 +0000 (14:15 +0800)]
No need to abort the audio HAL / Bluetooth when failed to suspend
When the headset was disconnecting, the audio HAL may not be able to
suspend the stream successfully, and it is no need to abort the process
for such acceptable failure. This change also adds extra log messages
about HIDL status.
Bug:
127654107
Test: Play / pause music via the Bluetooth manually
Change-Id: I335fcf75708343c7971ebd97514fea5db50f17a0
Cheney Ni [Wed, 13 Mar 2019 05:31:51 +0000 (22:31 -0700)]
Merge "Release encoder state when cleaning up the hearing aids instance"
am:
714a57639a
Change-Id: Iebef7301770d31cd38df3007b49aa52873aa0e29
Xin Li [Wed, 13 Mar 2019 05:21:51 +0000 (22:21 -0700)]
[automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190305.001 into master"
am:
01f16ea9f7 -s ours
am skip reason: subject contains skip directive
Change-Id: I23b7ed3c6c0b6f9af14443698fe7918d58269595
The Android Open Source Project [Wed, 13 Mar 2019 04:47:15 +0000 (21:47 -0700)]
[automerger skipped] DO NOT MERGE - Merge PPRL.190305.001 into master
am:
145c825e98 -s ours
am skip reason: subject contains skip directive
Change-Id: I23b7e1711f6351d09973e25d9defd9a6fefd4032
Treehugger Robot [Wed, 13 Mar 2019 02:43:26 +0000 (02:43 +0000)]
Merge "Release encoder state when cleaning up the hearing aids instance"
Xin Li [Wed, 13 Mar 2019 02:26:03 +0000 (02:26 +0000)]
Merge "DO NOT MERGE - Merge PPRL.190305.001 into master"
Jorge E. Moreira [Wed, 13 Mar 2019 00:41:11 +0000 (17:41 -0700)]
Allow to disable the rootcanal test console with a property
Rootcanal's test console is in a tcp socket which is forbiden for HALs
by the Android security policy.
Bug:
128355308
Test: run in cuttlefish, ensure no 'avc: denied' messages show up
Change-Id: I74bf07c34166d2df399f33194cbb41e57178edc2
Jorge E. Moreira [Tue, 12 Mar 2019 22:16:42 +0000 (15:16 -0700)]
Move controller_properties.json to the vendor image
Bug:
128355308
Test: build
Change-Id: I3cb9140b34af18569a983122eef3bd642516440c
Nick Kralevich [Tue, 12 Mar 2019 20:19:02 +0000 (13:19 -0700)]
compiler based array initialization
Have the caller null out the array rather than rely on the callee
performing a memset.
Bug:
121194976
Test: compiles. No runtime tests performed.
Change-Id: I1ce3f0530080769b97be0af313e822b74fd375ce
Joseph Pirozzo [Tue, 12 Mar 2019 19:30:19 +0000 (12:30 -0700)]
Recover from HandsFree client connection collision
If a HF client fails to connect (due to collision), clean up state such
that subsequent connection attempts will pass.
Bug:
118422992
Test: Connect HF client to AG
Change-Id: I093cf3d229956c66d9e8501eb882071600321555
Cheney Ni [Fri, 8 Mar 2019 15:41:42 +0000 (23:41 +0800)]
Release encoder state when cleaning up the hearing aids instance
When the Bluetooth state changes from ON to BLE_ON, the hearing aid
instance was cleaned up, but not encoder state. Since the Bluetooth
process is kept at BLE_ON but not exited, the new instance of the
hearing aids would see the encoder as initialized without starting a new
Bluetooth audio session, and caused the audio HAL to be unable to talk
to the stack. We now reset the encoder state when cleaning up the
instance, so it will start a session next time during the first
connection of a new hearing aid instance.
Bug:
127610666
Test: ON / OFF BT with BLE_ON and switch active device manually
Change-Id: I426fed4ea22c0b858bee273727fca6e2e7481e84
Weichin Weng [Tue, 12 Mar 2019 06:29:40 +0000 (23:29 -0700)]
Merge "Hearing Aid Dump Audio Tool: Add No Start Cmd feature"
am:
812ea5b2a4
Change-Id: I4ac4ba987795a949cb455f6e7159351045b77dd7
Weichin Weng [Tue, 12 Mar 2019 06:12:19 +0000 (06:12 +0000)]
Merge "Hearing Aid Dump Audio Tool: Add No Start Cmd feature"