OSDN Git Service
Greg Kaiser [Tue, 2 Apr 2019 17:35:23 +0000 (10:35 -0700)]
btif_storage: Avoid extra std::string copies am:
709a29f9e9
am:
f6dc9ad977
Change-Id: I1acf598e920d70da086aa20dcbd95cc2fa485f49
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 [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:24:19 +0000 (01:24 -0700)]
Merge "Fix use of uninitialised variable" am:
52b5f32e07
am:
0c80cbcda5
Change-Id: I283c56324359e9cdb5399860498392a4fb4294d7
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:28:49 +0000 (21:28 -0700)]
Merge "Disable Link layer socket device test in rootcanal" am:
460d035101
am:
38383e6aac
Change-Id: If5cec54274c84543ee09e3b0a4eeba2509372bdc
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:31:23 +0000 (19:31 -0700)]
[automerger skipped] Merge "Revert "DO NOT MERGE Hearing Aid: Add JNI API for add/remove whitelist"" am:
864fe7ad39 -s ours
am:
7421a10f21 -s ours
am skip reason: subject contains skip directive
Change-Id: I3a08d4f7b73e6aae0d1856b573b3a29079bf1beb
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:37:18 +0000 (14:37 -0700)]
Merge "Fix assert macro logical inversion" am:
c5b38fae53
am:
4bcfcf5bb9
Change-Id: I6a5a16e155a021cfbd3d631dc3421f694d37f9e0
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:27:35 +0000 (09:27 -0700)]
Merge "Fix potential null point dereference" am:
6bb3296e5e
am:
772792cc92
Change-Id: Ifbca848708d71ee96f2779428019eed2e7812df5
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:24:17 +0000 (18:24 -0700)]
Merge changes Ice4cee21,I6e579811,Ieae0cb21 am:
7c12a1727d
am:
3bd346c073
Change-Id: Iec7d3c6ae247218b18c7ce23c574979e41115292
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:57:11 +0000 (17:57 -0700)]
Merge "Get gd os tests running on host" am:
d4e4cc2f51
am:
8acdb3bf05
Change-Id: I88a93a21cc6a160db59131113a4871112545d476
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:09:05 +0000 (15:09 -0700)]
Merge "Run code coverage only on host target" am:
36277fcc67
am:
97545bb393
Change-Id: I4765a1209e247ccf9d1a19f17cc7a7a9b6a8c26e
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
TreeHugger Robot [Thu, 28 Mar 2019 17:30:37 +0000 (17:30 +0000)]
Merge "Log encryption key size" into pi-dev-plus-aosp
Ray Kuo [Thu, 28 Mar 2019 16:52:32 +0000 (09:52 -0700)]
Merge "BQR: Fix for the issue that Bluetooth keeps on crashing if the controller firmware does not support the BQR feature." am:
c19e159920
am:
555329a4ae
Change-Id: I594738be1148f77e55e62deba96b2503b3caaad8
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:24:09 +0000 (20:24 -0700)]
Merge "Only use the new format in gd/" am:
8b3df83108
am:
56365bdb6a
Change-Id: I65214b102aaa19c0a17d6de53a1daae5c26f0dd2
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/"
Jack He [Wed, 20 Mar 2019 20:31:58 +0000 (13:31 -0700)]
Log encryption key size
* Log result from HCI_READ_ENCR_KEY_SIZE command
Bug:
124301137
Test: test drive with statsd
Change-Id: Ifa195887284a22225a1b71d5a78a25cb8776647e
Merged-In: I6274f244a6f03d2a0054e985d7daf8104c8cdfe7
(cherry picked from commit
250d58170014667f5fca44ee8e73f4bf85165e56)
Hansong Zhang [Wed, 27 Mar 2019 22:46:11 +0000 (15:46 -0700)]
Merge "Copy reactor classes to new directory" am:
10a6432c6a
am:
696ed422c7
Change-Id: I6346249cc180fb85ec0514f43c248478d381752c
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:50:04 +0000 (14:50 -0700)]
Merge "A2DP: Initialize the UIPC HAL only when those binderized HALs are not enabled" am:
2ef65b9065
am:
f9979befa5
Change-Id: I8d1674fb2ecbac4b06fc6c6ed95e7c26c72a58d4
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:49:04 +0000 (10:49 -0700)]
Merge "Hearing aid: use new common/Timer" am:
39eba7165c
am:
ffb36c2132
Change-Id: Icd5b8b69c752238295f60d8adbc6df21b0cbe85f
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
Martin Stjernholm [Wed, 27 Mar 2019 12:38:34 +0000 (12:38 +0000)]
Revert "DO NOT MERGE Log encryption key size"
This reverts commit
fecbda5ef469c46391430ffa7aa604f5e947c258.
Reason for revert: Breaks aosp_*-userdebug targets
Bug:
129387219
Change-Id: I90934b68a1ddabb5666820fbae87aeb647a5c36c
Jack He [Thu, 21 Mar 2019 00:51:09 +0000 (17:51 -0700)]
DO NOT MERGE Log encryption key size
* Log result from HCI_READ_ENCR_KEY_SIZE command
Bug:
124301137
Test: test drive with statsd
Change-Id: Ib846bf06ebcddeaa85f6eae9d63144aae4a5faa7
(cherry picked from commit
7e8dbcd40b97c731d797c8967a6d44db856bca15)
Jakub Pawlowski [Thu, 14 Feb 2019 11:44:06 +0000 (12:44 +0100)]
DO NOT MERGE Drop Bluetooth connection with weak encryption key
This patch requires Bluetooth chip to support HCI Read Encryption Key Size
command and will cause Bluetooth to crash if this command is not supported
on a device. Such device should not take this patch and should look for
alternative solution to drop Bluetooth connection with weak encryption key.
Bug:
124301137
Test: make
Change-Id: I28f83628bc5eeda4e0632dc594770d040386b5fc
(cherry picked from commit
398473b74ebab9a47bf6f0615460f3c44ca09269)
Jack He [Wed, 27 Mar 2019 10:29:31 +0000 (03:29 -0700)]
[automerger skipped] Merge "DO NOT MERGE Log encryption key size" into pi-dev
am:
9515d91c6f -s ours
am skip reason: SHA1
9515d91c6f skipped by user siyuanh
Change-Id: I1a316d221cef64768e1a2ed1a5cb4b50cf3b78a5
Jakub Pawlowski [Wed, 27 Mar 2019 07:59:23 +0000 (00:59 -0700)]
[automerger skipped] DO NOT MERGE Drop Bluetooth connection with weak encryption key am:
049bf4ec4e -s ours am:
5237f6add3 -s ours am:
6caf0b031f -s ours
am:
45342e5ca8
Change-Id: I0c3df4ebff4c00a6d13006725eb0ccf7149dd920
Jakub Pawlowski [Wed, 27 Mar 2019 07:58:47 +0000 (00:58 -0700)]
[automerger skipped] [automerger] DO NOT MERGE Drop Bluetooth connection with weak encryption key am:
027532b367 am:
5f48bc8a86 am:
b788f8394e am:
a46c2b03a2 skipped:
f0213c3937 am:
1ecc29885a am:
262bb16a7e am:
633bf7e310 -s ours
am:
90f6b713f2
Change-Id: I236fd162455f4f0636d07e4bca8eb70c7308b54c
Jakub Pawlowski [Wed, 27 Mar 2019 07:58:09 +0000 (00:58 -0700)]
[automerger skipped] DO NOT MERGE Drop Bluetooth connection with weak encryption key am:
e32d4aa7a4 -s ours
am:
8818d4bb55
Change-Id: I4d40a32f2d65f9d99863b08af4829d42c28f3076
Jakub Pawlowski [Wed, 27 Mar 2019 07:57:41 +0000 (00:57 -0700)]
[automerger skipped] DO NOT MERGE Drop Bluetooth connection with weak encryption key
am:
398473b74e -s ours
am skip reason: SHA1
398473b74e skipped by user jpawlowski
Change-Id: I26d7ed0972ead1a5f79d63cf932d0b25b94c86b9
TreeHugger Robot [Wed, 27 Mar 2019 05:09:25 +0000 (05:09 +0000)]
Merge "DO NOT MERGE Log encryption key size" into pi-dev
Jakub Pawlowski [Tue, 26 Mar 2019 23:20:56 +0000 (16:20 -0700)]
[automerger skipped] DO NOT MERGE Drop Bluetooth connection with weak encryption key am:
049bf4ec4e -s ours am:
5237f6add3 -s ours
am:
6caf0b031f -s ours
am skip reason: subject contains skip directive
Change-Id: I2a7fe904c4d72a88fa0db1f3d9e55753f8f5aa01
Jakub Pawlowski [Tue, 26 Mar 2019 23:14:53 +0000 (16:14 -0700)]
[automerger skipped] [automerger] DO NOT MERGE Drop Bluetooth connection with weak encryption key am:
027532b367 am:
5f48bc8a86 am:
b788f8394e am:
a46c2b03a2 skipped:
f0213c3937 am:
1ecc29885a am:
262bb16a7e
am:
633bf7e310 -s ours
am skip reason: subject contains skip directive
Change-Id: I4cf14b1e4d53a53e553dfa31afc0a11b2e31dee1
Jakub Pawlowski [Tue, 26 Mar 2019 23:14:42 +0000 (16:14 -0700)]
[automerger skipped] DO NOT MERGE Drop Bluetooth connection with weak encryption key am:
049bf4ec4e -s ours
am:
5237f6add3 -s ours
am skip reason: change_id Id4b6b4e765628397a79e6806f45c2cd27acebd5b with SHA1
027532b367 is in history
Change-Id: I56780086be9ba71ee573956d0991824db7ebba0f
Jakub Pawlowski [Tue, 26 Mar 2019 23:14:08 +0000 (16:14 -0700)]
[automerger] DO NOT MERGE Drop Bluetooth connection with weak encryption key am:
027532b367 am:
5f48bc8a86 am:
b788f8394e am:
a46c2b03a2 skipped:
f0213c3937 am:
1ecc29885a
am:
262bb16a7e
Change-Id: Iebb2f610252f8cec64ea7003fd1955d30b7fcf79
Jakub Pawlowski [Tue, 26 Mar 2019 23:02:58 +0000 (16:02 -0700)]
[automerger skipped] DO NOT MERGE Drop Bluetooth connection with weak encryption key
am:
049bf4ec4e -s ours
am skip reason: change_id Id4b6b4e765628397a79e6806f45c2cd27acebd5b with SHA1
027532b367 is in history
Change-Id: I9f7f56c8620a99ce5f2a4bf0e33eb94cdac829a5
Jakub Pawlowski [Tue, 26 Mar 2019 22:26:23 +0000 (15:26 -0700)]
[automerger skipped] DO NOT MERGE Drop Bluetooth connection with weak encryption key
am:
e32d4aa7a4 -s ours
am skip reason: subject contains skip directive
Change-Id: Ica0e4d762e9b9e50847c0403a1fd70724f9be020
Jakub Pawlowski [Tue, 26 Mar 2019 22:10:24 +0000 (15:10 -0700)]
[automerger] DO NOT MERGE Drop Bluetooth connection with weak encryption key am:
027532b367 am:
5f48bc8a86 am:
b788f8394e am:
a46c2b03a2 skipped:
f0213c3937
am:
1ecc29885a
Change-Id: I43f7d01e376f8260e1120d3a403c41f45eca5950
Jakub Pawlowski [Thu, 14 Feb 2019 11:44:06 +0000 (12:44 +0100)]
DO NOT MERGE Drop Bluetooth connection with weak encryption key
This patch requires Bluetooth chip to support HCI Read Encryption Key Size
command and will cause Bluetooth to crash if this command is not supported
on a device. Such device should not take this patch and should look for
alternative solution to drop Bluetooth connection with weak encryption key.
Bug:
124301137
Merged-In: Id4b6b4e765628397a79e6806f45c2cd27acebd5b
Change-Id: Id4b6b4e765628397a79e6806f45c2cd27acebd5b
Jack He [Thu, 21 Mar 2019 00:51:09 +0000 (17:51 -0700)]
DO NOT MERGE Log encryption key size
* Log result from HCI_READ_ENCR_KEY_SIZE command
Bug:
124301137
Test: test drive with statsd
Change-Id: I776a3c357fcd75623fba241f150d1afb58aa23fb
Chienyuan [Mon, 25 Mar 2019 16:43:34 +0000 (09:43 -0700)]
Add test about post/clear task from callback for handler am:
13369ff8d1
am:
55ef162693
Change-Id: I514486c83fa84c6f45e3be771b24fa78fd676ed1
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
Martin Brabham [Fri, 22 Mar 2019 21:43:24 +0000 (14:43 -0700)]
[DO NOT MERGE] btif/osi: move I/O to OSI layer. disable for multi-user.
am:
e689266be5
Change-Id: I29d03a2bd2b43ca4f120444c42f3f836de8f727f
Martin Brabham [Fri, 22 Mar 2019 21:43:08 +0000 (14:43 -0700)]
[automerger skipped] [DO NOT MERGE] Handle edge cases where input or hash/data could be null.
am:
8fce4bca61 -s ours
am skip reason: change_id Ia91ea822ee2147b2a2d14bea250a708e8c10bae4 with SHA1
2288446205 is in history
Change-Id: Id9b2eaf4160eca3ef239a99c3374b57f7ac41e31
Greg Kaiser [Fri, 22 Mar 2019 21:42:52 +0000 (14:42 -0700)]
[automerger skipped] [DO NOT MERGE] btif: Avoid resource leak in error case
am:
1c981598b8 -s ours
am skip reason: SHA1
1c981598b8 skipped by user optedoblivion
Change-Id: Ic84f9cf44a828c931478e985ee6b648ba892fe85
Greg Kaiser [Fri, 22 Mar 2019 21:42:37 +0000 (14:42 -0700)]
[automerger skipped] [DO NOT MERGE] btif: Avoid a couple string copies
am:
f7e12c2ea6 -s ours
am skip reason: SHA1
f7e12c2ea6 skipped by user optedoblivion
Change-Id: I8939b4f90a5220c814a421acc9ff508c1dc4f673
Greg Kaiser [Fri, 22 Mar 2019 21:42:21 +0000 (14:42 -0700)]
[automerger skipped] [DO NOT MERGE] btif: Lighter weight file existence check
am:
169ddca90e -s ours
am skip reason: change_id Ib47b24e9d96803b7822535f9f566aa7818b38953 with SHA1
ff7b436378 is in history
Change-Id: If7af752323d5275478bf6d606fd9ebbf1a788442
Martin Brabham [Fri, 22 Mar 2019 21:42:04 +0000 (14:42 -0700)]
[automerger skipped] [DO NOT MERGE] Implement key attestation using AndroidKeystore.
am:
e0f1e9a32c -s ours
am skip reason: change_id I26de9ea05f515d6643a83d11628490fb49e10743 with SHA1
5f67e5ff1c is in history
Change-Id: Ib043f2b93d95cb939c1cd2d853e00abfb284e09f
Android Build Merger (Role) [Fri, 22 Mar 2019 18:30:05 +0000 (18:30 +0000)]
[automerger] DO NOT MERGE Drop Bluetooth connection with weak encryption key am:
027532b367 am:
5f48bc8a86 am:
b788f8394e am:
a46c2b03a2 skipped:
f0213c3937
Change-Id: I028d493ce2aae117a28422b68df67dd424b28148
Android Build Merger (Role) [Fri, 22 Mar 2019 18:30:03 +0000 (18:30 +0000)]
[automerger] DO NOT MERGE Drop Bluetooth connection with weak encryption key am:
027532b367 am:
5f48bc8a86 am:
b788f8394e am:
a46c2b03a2
Change-Id: I203993fecd15608d036b79ae9f1bcf1e6e5536b1
Android Build Merger (Role) [Fri, 22 Mar 2019 18:30:01 +0000 (18:30 +0000)]
[automerger] DO NOT MERGE Drop Bluetooth connection with weak encryption key am:
027532b367 am:
5f48bc8a86 am:
b788f8394e
Change-Id: Iebe131904b01492285eaaeaf6408b76037b2643e
Android Build Merger (Role) [Fri, 22 Mar 2019 18:29:58 +0000 (18:29 +0000)]
[automerger] DO NOT MERGE Drop Bluetooth connection with weak encryption key am:
027532b367 am:
5f48bc8a86
Change-Id: Ia0fb7cb6c331f4f30b4a2320fa52b66be425c74f
Android Build Merger (Role) [Fri, 22 Mar 2019 18:29:56 +0000 (18:29 +0000)]
[automerger] DO NOT MERGE Drop Bluetooth connection with weak encryption key am:
027532b367
Change-Id: I4fb660ac5ca288993e6f0643929eb1b1def1040c
Jakub Pawlowski [Thu, 14 Feb 2019 11:44:06 +0000 (12:44 +0100)]
DO NOT MERGE Drop Bluetooth connection with weak encryption key
This patch requires Bluetooth chip to support HCI Read Encryption Key Size
command and will cause Bluetooth to crash if this command is not supported
on a device. Such device should not take this patch and should look for
alternative solution to drop Bluetooth connection with weak encryption key.
Bug:
124301137
Change-Id: Id4b6b4e765628397a79e6806f45c2cd27acebd5b
Jakub Pawlowski [Thu, 14 Feb 2019 11:44:06 +0000 (12:44 +0100)]
DO NOT MERGE Drop Bluetooth connection with weak encryption key
This patch requires Bluetooth chip to support HCI Read Encryption Key Size
command and will cause Bluetooth to crash if this command is not supported
on a device. Such device should not take this patch and should look for
alternative solution to drop Bluetooth connection with weak encryption key.
Bug:
124301137
Change-Id: Id4b6b4e765628397a79e6806f45c2cd27acebd5b
Jakub Pawlowski [Thu, 14 Feb 2019 11:44:06 +0000 (12:44 +0100)]
DO NOT MERGE Drop Bluetooth connection with weak encryption key
This patch requires Bluetooth chip to support HCI Read Encryption Key Size
command and will cause Bluetooth to crash if this command is not supported
on a device. Such device should not take this patch and should look for
alternative solution to drop Bluetooth connection with weak encryption key.
Bug:
124301137
Change-Id: Id4b6b4e765628397a79e6806f45c2cd27acebd5b
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
Martin Brabham [Tue, 12 Feb 2019 19:23:39 +0000 (11:23 -0800)]
[DO NOT MERGE] Handle edge cases where input or hash/data could be null.
Bug: b/
117993149
Test: Manual; atest net_test_btif net_test_bluetooth
Change-Id: Ia91ea822ee2147b2a2d14bea250a708e8c10bae4
Merged-In: Ia91ea822ee2147b2a2d14bea250a708e8c10bae4
Cheney Ni [Fri, 22 Mar 2019 07:59:31 +0000 (00:59 -0700)]
Merge "Fallback to the legacy HAL when IBluetoothAudioProvidersFactory is unsupported" am:
86ef0c76da
am:
3298f7c3b1
Change-Id: I752579f8f83a8b5023495deed0154f1141acdd04
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:14:49 +0000 (19:14 -0700)]
Merge "Refine the log messages of audio_bluetooth_hal" am:
cb7b7e432f
am:
e432be1c8f
Change-Id: I402d2351d080088e14fa0ad9b7e6ca46c4da8386
Cheney Ni [Thu, 21 Mar 2019 02:14:14 +0000 (19:14 -0700)]
Merge "Add a workaround to play A2DP SBC Mono" am:
532316c0ae
am:
2200a20761
Change-Id: I239abf6ae6233bbaf41f06c29671c454aba84d4e