OSDN Git Service
Hansong Zhang [Wed, 27 Mar 2019 22:54:36 +0000 (15:54 -0700)]
Merge "Copy reactor classes to new directory" am:
10a6432c6a am:
696ed422c7
am:
5d2965062c
Change-Id: I880995baa70364433fa4e217bde96056b981d092
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"
Cheney Ni [Wed, 27 Mar 2019 22:08:51 +0000 (15:08 -0700)]
Merge "A2DP: Initialize the UIPC HAL only when those binderized HALs are not enabled" am:
2ef65b9065 am:
f9979befa5
am:
3b0c8a5412
Change-Id: I9449e0016cd7c66fab0c3dfb97bbc46d139833ea
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:53:10 +0000 (10:53 -0700)]
Merge "Hearing aid: use new common/Timer" am:
39eba7165c am:
ffb36c2132
am:
59fee7d56d
Change-Id: If9b8a3ec1eaf0018a2b1ef4fd5afa46741014bb2
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 13:51:41 +0000 (06:51 -0700)]
[automerger skipped] Revert "DO NOT MERGE Log encryption key size"
am:
1a050237b7 -s ours
am skip reason: subject contains skip directive
Change-Id: I00d57d2b52fcac841851f1c391a9d476f3bfdc4d
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 [Wed, 27 Mar 2019 10:54:09 +0000 (03:54 -0700)]
[automerger skipped] DO NOT MERGE Log encryption key size
am:
fecbda5ef4 -s ours
am skip reason: subject contains skip directive
Change-Id: If306e99e1afd0ac97436a16f4f2722918ee03530
Jakub Pawlowski [Wed, 27 Mar 2019 10:54:00 +0000 (03:54 -0700)]
[automerger skipped] DO NOT MERGE Drop Bluetooth connection with weak encryption key
am:
2dae274ab9 -s ours
am skip reason: subject contains skip directive
Change-Id: Ic3ea842e8268d67b6463c58557117ac42efdc9d9
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:35:10 +0000 (03:35 -0700)]
[automerger skipped] Merge "DO NOT MERGE Log encryption key size" into pi-dev am:
9515d91c6f -s ours
am:
a360163739 -s ours
am skip reason: subject contains skip directive
Change-Id: I7edb09c9359c52fd0a57e3d2258fd92d2de05767
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 08:20:19 +0000 (01: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:
45342e5ca8
am:
3e3aa5eb04 -s ours
am skip reason: subject contains skip directive
Change-Id: Icdb1e3eaf5877c32bc975ec4074c87a175965085
Jakub Pawlowski [Wed, 27 Mar 2019 08:20:02 +0000 (01:20 -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
am:
17ad1dae93 -s ours
am skip reason: subject contains skip directive
Change-Id: Ib8f5bda17e658def2718ed8009664fad5ca51885
Jakub Pawlowski [Wed, 27 Mar 2019 08:19:46 +0000 (01:19 -0700)]
[automerger skipped] DO NOT MERGE Drop Bluetooth connection with weak encryption key am:
e32d4aa7a4 -s ours am:
8818d4bb55
am:
09670a8916 -s ours
am skip reason: subject contains skip directive
Change-Id: I40bf09500901a97be780d46a554da1c392a01835
Jakub Pawlowski [Wed, 27 Mar 2019 08:18:45 +0000 (01:18 -0700)]
[automerger skipped] DO NOT MERGE Drop Bluetooth connection with weak encryption key am:
398473b74e -s ours
am:
52542eadd7 -s ours
am skip reason: subject contains skip directive
Change-Id: Idfc2774fdd0a942514ddadcc86406f77b6d484cb
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 [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: I6274f244a6f03d2a0054e985d7daf8104c8cdfe7
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
Jakub Pawlowski [Thu, 14 Feb 2019 11:44:06 +0000 (12:44 +0100)]
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
Chienyuan [Mon, 25 Mar 2019 16:48:01 +0000 (09:48 -0700)]
Add test about post/clear task from callback for handler am:
13369ff8d1 am:
55ef162693
am:
41e00a4f7b
Change-Id: Id564c2b0347ec87c65d224a53c36b5b88b81b8ae
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:46:37 +0000 (14:46 -0700)]
[automerger skipped] [DO NOT MERGE] btif/osi: move I/O to OSI layer. disable for multi-user. am:
e689266be5
am:
ebfdba0384 -s ours
am skip reason: subject contains skip directive
Change-Id: I2f8278ed30dfa11047993edc9861de1a799ae640
Martin Brabham [Fri, 22 Mar 2019 21:46:29 +0000 (14:46 -0700)]
[automerger skipped] [DO NOT MERGE] Handle edge cases where input or hash/data could be null. am:
8fce4bca61 -s ours
am:
513cb0c4c5 -s ours
am skip reason: subject contains skip directive
Change-Id: I31ed2f0451b8bdfe9718345592c51ee49f805914
Greg Kaiser [Fri, 22 Mar 2019 21:46:21 +0000 (14:46 -0700)]
[automerger skipped] [DO NOT MERGE] btif: Avoid resource leak in error case am:
1c981598b8 -s ours
am:
7e5b450a17 -s ours
am skip reason: subject contains skip directive
Change-Id: I4a0dd1d7fa041a70b03c217c1c5d30edf1a3f181
Greg Kaiser [Fri, 22 Mar 2019 21:46:13 +0000 (14:46 -0700)]
[automerger skipped] [DO NOT MERGE] btif: Avoid a couple string copies am:
f7e12c2ea6 -s ours
am:
0beb7dda3b -s ours
am skip reason: subject contains skip directive
Change-Id: I8bfc6c0283c45b0fcd326e12b79eac8d12d36d25
Greg Kaiser [Fri, 22 Mar 2019 21:46:04 +0000 (14:46 -0700)]
[automerger skipped] [DO NOT MERGE] btif: Lighter weight file existence check am:
169ddca90e -s ours
am:
4d775f29f7 -s ours
am skip reason: subject contains skip directive
Change-Id: Icdae2a6f6b1ada7b61162b2cf13f18b97022c346
Martin Brabham [Fri, 22 Mar 2019 21:45:56 +0000 (14:45 -0700)]
[automerger skipped] [DO NOT MERGE] Implement key attestation using AndroidKeystore. am:
e0f1e9a32c -s ours
am:
db9e241d85 -s ours
am skip reason: subject contains skip directive
Change-Id: Ie90fc17e9248b2b917e8b2d6a9a04b415df5415b
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
Martin Brabham [Fri, 22 Mar 2019 17:48:01 +0000 (10:48 -0700)]
[automerger skipped] [DO NOT MERGE] Handle edge cases where input or hash/data could be null.
am:
2288446205 -s ours
am skip reason: subject contains skip directive
Change-Id: I4fdfa7c641e372e5950c28b2a298243d12f5410e
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 08:05:07 +0000 (01:05 -0700)]
Merge "Fallback to the legacy HAL when IBluetoothAudioProvidersFactory is unsupported" am:
86ef0c76da am:
3298f7c3b1
am:
d14c1e632c
Change-Id: I6e2e00544274d92a0ba8d9934bb479b2594ed3d8
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"
Deqiang Chen [Thu, 21 Mar 2019 15:57:03 +0000 (15:57 +0000)]
Merge "hf_client: Pass an empty string when number_present is false"
Cheney Ni [Thu, 21 Mar 2019 02:20:45 +0000 (19:20 -0700)]
Merge "Refine the log messages of audio_bluetooth_hal" am:
cb7b7e432f am:
e432be1c8f
am:
caed4f2d8c
Change-Id: Ie2303a4d17738aab9c806da11b02c5fa492e16c8
Cheney Ni [Thu, 21 Mar 2019 02:20:04 +0000 (19:20 -0700)]
Merge "Add a workaround to play A2DP SBC Mono" am:
532316c0ae am:
2200a20761
am:
ee82b3bba3
Change-Id: If8d0d7b5239fb41a777eebdf85145b53a15a436b
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
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 01:26:24 +0000 (18:26 -0700)]
Merge "Add event_value to BluetoothClassicPairingEventReported" am:
a0060ceed6 am:
14a2675ff5
am:
71e637748b
Change-Id: Id788bdf76d83589c2ae9c297e0c60bb360061498
Jack He [Thu, 21 Mar 2019 01:02:55 +0000 (18:02 -0700)]
Merge "Add event_value to BluetoothClassicPairingEventReported" am:
a0060ceed6
am:
14a2675ff5
Change-Id: I46340fe3f781a31de893e765aa28b9888df4e801
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"
Deqiang Chen [Wed, 20 Mar 2019 21:02:27 +0000 (14:02 -0700)]
hf_client: Pass an empty string when number_present is false
When the AG dials a number that is more than 32 digits long, the CLCC
response to HF contains an invalid number. This will be detected and
eventually leads to the number string being null when calling isValidUtf
in current_calls_cb. This causes isValidUtf() to crash with a null pointer
dereference.
Bug:
128910739
Bug:
109838537
Test: local test to observe no crash at HF side when dialing a long
invalid number in AG (paired phone).
Change-Id: Ie1b9f62007d523e644b54bda50f11975f2b3d034
Elliott Hughes [Wed, 20 Mar 2019 20:05:42 +0000 (13:05 -0700)]
Merge "Use PLOG rather than LOG strerror(errno)." am:
fa450772a8 am:
5d5436ee5f
am:
b53cf6595b
Change-Id: I7eae7ab777ec76da05e892de27f48b1bf7ff97f5
Elliott Hughes [Wed, 20 Mar 2019 19:56:46 +0000 (12:56 -0700)]
Merge "Use PLOG rather than LOG strerror(errno)." am:
fa450772a8
am:
5d5436ee5f
Change-Id: I0f697d7ae005c9e6c324434d28b26f025016acd5
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 21:22:20 +0000 (14:22 -0700)]
Add Rx RSSI logs for Hearing Aids am:
10c80b5ce2 am:
9cf1f8e3f7
am:
eeca4fc306
Change-Id: Iab7ceb0460bd9ca829ebbc44e37e71e99044b307
Stanley Tng [Mon, 18 Mar 2019 20:59:34 +0000 (13:59 -0700)]
Add Rx RSSI logs for Hearing Aids am:
10c80b5ce2
am:
9cf1f8e3f7
Change-Id: I9bdf78e65da358c97aff25343aa5eb57658961d9
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
Greg Kaiser [Fri, 15 Mar 2019 17:46:53 +0000 (10:46 -0700)]
[automerger skipped] [DO NOT MERGE] btif: Lighter weight file existence check
am:
ff7b436378 -s ours
am skip reason: subject contains skip directive
Change-Id: Iecad81596122ab2e812514f98776251bd504a254