OSDN Git Service
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
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
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
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
Greg Kaiser [Thu, 7 Feb 2019 16:54:01 +0000 (08:54 -0800)]
[DO NOT MERGE] btif: Lighter weight file existence check
We switch from the heavier weight fopen() to using access() to
check for file existence and readability. This avoids some of
the file opening overhead we don't need here.
Bug: b/
117993149
Test: TreeHugger
Change-Id: Ib47b24e9d96803b7822535f9f566aa7818b38953
Merged-In: Ib47b24e9d96803b7822535f9f566aa7818b38953
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:45:53 +0000 (13:45 -0700)]
Merge "Allow to disable the rootcanal test console with a property" am:
ddd6a6f7c0 am:
95c9578bf0
am:
e5655a7fec
Change-Id: I15994cf025488993c3665040141ee699fdc48fbb
Jorge Moreira Broche [Thu, 14 Mar 2019 20:40:43 +0000 (13:40 -0700)]
Merge "Allow to disable the rootcanal test console with a property" am:
ddd6a6f7c0
am:
95c9578bf0
Change-Id: Ie15420c9503f4317b1553feac2ae14745a6cea4e
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:43:08 +0000 (11:43 -0700)]
Merge "No need to abort the audio HAL / Bluetooth when failed to suspend" am:
0cc83418b1 am:
3b22b4dbd1
am:
3d5acee2a1
Change-Id: I1e976af748527013ea9293138087f3e3c47abc09
Cheney Ni [Thu, 14 Mar 2019 18:30:03 +0000 (11:30 -0700)]
Merge "No need to abort the audio HAL / Bluetooth when failed to suspend" am:
0cc83418b1
am:
3b22b4dbd1
Change-Id: Id562fde8f1095896b3ff1f96612d75a66d7512be
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:14:54 +0000 (21:14 -0700)]
Merge "Move controller_properties.json to the vendor image" am:
6f80399e14 am:
fa444401ba
am:
b73c4fa82a
Change-Id: I530dd9a2c786d962325ad672985cdb83fa3445fc
Jorge E. Moreira [Thu, 14 Mar 2019 04:10:44 +0000 (21:10 -0700)]
Merge "Move controller_properties.json to the vendor image" am:
6f80399e14
am:
fa444401ba
Change-Id: Ib1d0ed526be24bcd4f33ea487eefc5f4c3f012d9
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"
TreeHugger Robot [Thu, 14 Mar 2019 03:25:18 +0000 (03:25 +0000)]
Merge "Validate all AVRCP packets before use to prevent out of bounds reads."
Martin Brabham [Thu, 14 Mar 2019 00:05:32 +0000 (17:05 -0700)]
[automerger skipped] Revert "Revert "[DO NOT MERGE] Implement key attestation using AndroidKeystore.""
am:
7f570f8673 -s ours
am skip reason: subject contains skip directive
Change-Id: If76546b534b8f7dd16763184cae2ee851de88bc9
Martin Brabham [Wed, 13 Mar 2019 23:39:59 +0000 (16:39 -0700)]
Revert "Revert "[DO NOT MERGE] Implement key attestation using AndroidKeystore.""
This reverts commit
6efe553ed61ebed2e9198ee1754031eabefe11b2.
Removes reference to btif_hl.cc from Android.bp
Change-Id: I66f4a672c4559a3055f06d9ec0eca543d094ea34
Myles Watson [Wed, 13 Mar 2019 23:35:18 +0000 (16:35 -0700)]
[automerger skipped] Merge "Revert "[DO NOT MERGE] Implement key attestation using AndroidKeystore."" into pi-dev-plus-aosp
am:
a20390b7ac -s ours
am skip reason: subject contains skip directive
Change-Id: I231f0b0853d19bd243a7fc63b984538e8d62f7fd
TreeHugger Robot [Wed, 13 Mar 2019 23:30:14 +0000 (23:30 +0000)]
Merge "Revert "[DO NOT MERGE] Implement key attestation using AndroidKeystore."" into pi-dev-plus-aosp
Myles Watson [Wed, 13 Mar 2019 23:28:53 +0000 (23:28 +0000)]
Revert "[DO NOT MERGE] Implement key attestation using AndroidKeystore."
This reverts commit
5f67e5ff1c7eb4255e5faa09bf1f31e3d151deee.
Reason for revert: Broken build
Change-Id: I7953f66d707c68733ac48e8f21d7e5ae3131c72d
Martin Brabham [Wed, 13 Mar 2019 22:43:21 +0000 (15:43 -0700)]
[automerger skipped] Merge "[DO NOT MERGE] Implement key attestation using AndroidKeystore." into pi-dev-plus-aosp
am:
9eddaabde9 -s ours
am skip reason: subject contains skip directive
Change-Id: I1847c3c4b7504b3995da132f14facae03f799542
TreeHugger Robot [Wed, 13 Mar 2019 22:22:04 +0000 (22:22 +0000)]
Merge "[DO NOT MERGE] Implement key attestation using AndroidKeystore." into pi-dev-plus-aosp
Ajay Panicker [Tue, 5 Mar 2019 21:07:09 +0000 (13:07 -0800)]
Validate all AVRCP packets before use to prevent out of bounds reads.
If a packet arrives that is too short to read all the fields from, then
an out of bounds read occurs. This patch validates all recieved packets
before use.
Bug:
119562595
Test: run net_test_avrcp
Change-Id: Ifc1c0def1b411664facbbeb7e4d6e9c56ecc31c1
Nick Kralevich [Wed, 13 Mar 2019 18:48:27 +0000 (11:48 -0700)]
Merge "compiler based array initialization" am:
e9220762b0 am:
dbf14b5620
am:
c2ae03a6fc
Change-Id: Icb5894e399548b09a9a8a70fef80938491b80e1d
Nick Kralevich [Wed, 13 Mar 2019 18:40:17 +0000 (11:40 -0700)]
Merge "compiler based array initialization" am:
e9220762b0
am:
dbf14b5620
Change-Id: Ie1808cd0fa8f72f426cf0b3a2c316b5b3dd075a0
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:22:47 +0000 (09:22 -0700)]
Merge "Recover from HandsFree client connection collision" am:
3081c2e81a am:
c862f3b497
am:
dfe29ae69a
Change-Id: I79d91a798f49344c9bd1ea593ed94916a9e585df
Joseph Pirozzo [Wed, 13 Mar 2019 16:19:14 +0000 (09:19 -0700)]
Merge "Recover from HandsFree client connection collision" am:
3081c2e81a
am:
c862f3b497
Change-Id: If9dd0106f94e16bd2b2514ef8120504f77fac26d
Martin Brabham [Fri, 1 Feb 2019 21:42:58 +0000 (13:42 -0800)]
[DO NOT MERGE] Implement key attestation using AndroidKeystore.
Store SHA256 hash of the config file in an encrypted file that has been encrypted using the Android Keystore API.
Bug: b/
117993149
Test: Manual
Change-Id: I26de9ea05f515d6643a83d11628490fb49e10743
Merged-In: I26de9ea05f515d6643a83d11628490fb49e10743
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 06:38:28 +0000 (23:38 -0700)]
Merge "Release encoder state when cleaning up the hearing aids instance" am:
714a57639a am:
c0d2b0a267
am:
01825f7014
Change-Id: Ia800d32cc40c54424467c36d84f625c13beda5fd
Xin Li [Wed, 13 Mar 2019 06:28:20 +0000 (23:28 -0700)]
[automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190305.001 into master" am:
01f16ea9f7 -s ours am:
1df753532b -s ours
am:
1194aa3fad -s ours
am skip reason: subject contains skip directive
Change-Id: I0676dd45c9bd21342db7bbf817cfb20c1045444c
Cheney Ni [Wed, 13 Mar 2019 06:06:35 +0000 (23:06 -0700)]
Merge "Release encoder state when cleaning up the hearing aids instance" am:
714a57639a
am:
c0d2b0a267
Change-Id: I7d3db64628d53f9f9d24310c9e95e27e48411cce
The Android Open Source Project [Wed, 13 Mar 2019 06:01:53 +0000 (23:01 -0700)]
[automerger skipped] DO NOT MERGE - Merge PPRL.190305.001 into master am:
145c825e98 -s ours am:
1b16661782 -s ours
am:
c63e3d74b8 -s ours
am skip reason: subject contains skip directive
Change-Id: I49e9cf29d6d9bdab9354a762810204bef67c748a
Xin Li [Wed, 13 Mar 2019 05:54:41 +0000 (22:54 -0700)]
[automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190305.001 into master" am:
01f16ea9f7 -s ours
am:
1df753532b -s ours
am skip reason: subject contains skip directive
Change-Id: I4d783526094eb34484b3f581e84581d81aaa7460
The Android Open Source Project [Wed, 13 Mar 2019 05:34:05 +0000 (22:34 -0700)]
[automerger skipped] DO NOT MERGE - Merge PPRL.190305.001 into master am:
145c825e98 -s ours
am:
1b16661782 -s ours
am skip reason: subject contains skip directive
Change-Id: I55ea3cfa72601fc8090a16cc165696af6eeca0eb
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
Weichin Weng [Tue, 12 Mar 2019 06:58:51 +0000 (23:58 -0700)]
Merge "Hearing Aid Dump Audio Tool: Add No Start Cmd feature" am:
812ea5b2a4 am:
37dbb1af4b
am:
9d535a7b2e
Change-Id: Ifd10fbef337f892767828bc6c1cabb8ef795d6c5