OSDN Git Service
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 [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"
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: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"
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 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 [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: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: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: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"
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
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
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
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: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:06:35 +0000 (23:06 -0700)]
Merge "Release encoder state when cleaning up the hearing aids instance" am:
714a57639a
am:
c0d2b0a267
Change-Id: I7d3db64628d53f9f9d24310c9e95e27e48411cce
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:39:42 +0000 (23:39 -0700)]
Merge "Hearing Aid Dump Audio Tool: Add No Start Cmd feature" am:
812ea5b2a4
am:
37dbb1af4b
Change-Id: If55b46e573d01a777befaa423a3b4e5e1f3b2300
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"
Martin Brabham [Mon, 25 Feb 2019 22:40:33 +0000 (14:40 -0800)]
[DO NOT MERGE] btif/osi: move I/O to OSI layer. disable for multi-user.
Two issues here.
One, read/write/modify/remove access to the checksum by the secondary user.
Two, Fail to access keystore with secondary user stack running (stack doesn't run as UID 1002)
Bug:
117993149
Test: atest net_test_btif net_test_bluetooth net_test_osi
Change-Id: I7af452e00a4f342f1c49006e86488b59195b70ce
Merged-In: I7af452e00a4f342f1c49006e86488b59195b70ce
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
Greg Kaiser [Thu, 7 Feb 2019 16:40:11 +0000 (08:40 -0800)]
[DO NOT MERGE] btif: Avoid resource leak in error case
If our memory allocation fails, we make sure we close our file
before returning.
Bug: b/
117993149
Test: TreeHugger
Change-Id: I43b43d8b3d96e51a73bc8187ef614d02bbd31781
Merged-In: I43b43d8b3d96e51a73bc8187ef614d02bbd31781
Greg Kaiser [Thu, 7 Feb 2019 16:48:20 +0000 (08:48 -0800)]
[DO NOT MERGE] btif: Avoid a couple string copies
We pass a couple string arguments by const reference instead of
by copy.
Bug: b/
117993149
Test: TreeHugger
Change-Id: I01e476edf1f5e8c7b6fc88e0eb87ed3bbfca7a00
Merged-In: I01e476edf1f5e8c7b6fc88e0eb87ed3bbfca7a00
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
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
The Android Open Source Project [Mon, 11 Mar 2019 18:55:08 +0000 (11:55 -0700)]
DO NOT MERGE - Merge PPRL.190305.001 into master
Bug:
127812889
Change-Id: I733a17b7dd1e24a6f4a19aac2d45e312b15e0199
Ajay Panicker [Mon, 11 Mar 2019 17:32:32 +0000 (10:32 -0700)]
[automerger skipped] Merge "DO NOT MERGE: Use a weak pointer to deliver updates to AVRCP devices." into pi-dev
am:
cac66ef659 -s ours
am skip reason: SHA1
cac66ef659 skipped by user apanicke
Change-Id: Icea737fc2c51d0df1fb3bfc0bf9652cbcf3b6bbe
Xin Li [Mon, 11 Mar 2019 16:29:52 +0000 (09:29 -0700)]
[automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190305.001 into stage-aosp-master" into stage-aosp-master
am:
d41cac112d -s ours
am skip reason: subject contains skip directive
Change-Id: Ib68c3354a2515fb510b4695220470b5821dd83ca
The Android Open Source Project [Mon, 11 Mar 2019 16:21:57 +0000 (09:21 -0700)]
[automerger skipped] DO NOT MERGE - Merge PPRL.190305.001 into stage-aosp-master
am:
4a6c7d8b2e -s ours
am skip reason: subject contains skip directive
Change-Id: I83c0c9d7e480814ae58c8cb6a438c60b8b39ebfa
Xin Li [Mon, 11 Mar 2019 16:09:42 +0000 (16:09 +0000)]
Merge "DO NOT MERGE - Merge PPRL.190305.001 into stage-aosp-master" into stage-aosp-master
weichinweng [Thu, 7 Mar 2019 07:25:43 +0000 (15:25 +0800)]
Hearing Aid Dump Audio Tool: Add No Start Cmd feature
When the HCI Snoop logs wraparound, the Hearing Aid Audio Control
Command "Start" is lost. For the case, we can enable No Start Cmd
feature to set a fake "Start" to extract audio data.
Bug:
127745964
Test: ./dump_hearingaid_audio.py -c1 1 -c2 3 -ns true btsnoop_hci.log
Change-Id: Id7f67da0d5476faf38352ab57339fed8e358bac6
TreeHugger Robot [Sat, 9 Mar 2019 03:09:41 +0000 (03:09 +0000)]
Merge "DO NOT MERGE: Use a weak pointer to deliver updates to AVRCP devices." into pi-dev
Ajay Panicker [Sat, 9 Mar 2019 00:33:09 +0000 (16:33 -0800)]
Merge "Use a weak pointer to deliver updates to AVRCP devices." am:
80eeba2af3
am:
b37ce65dce
Change-Id: Ic2052e18456948bc21d88a13887ccb24eb965a4e
Ajay Panicker [Sat, 9 Mar 2019 00:29:03 +0000 (16:29 -0800)]
Merge "Use a weak pointer to deliver updates to AVRCP devices."
am:
80eeba2af3
Change-Id: Ie9d8501153264be4a755ae88956b585df3c1bdad
Treehugger Robot [Sat, 9 Mar 2019 00:18:09 +0000 (00:18 +0000)]
Merge "Use a weak pointer to deliver updates to AVRCP devices."
The Android Open Source Project [Fri, 8 Mar 2019 23:57:00 +0000 (15:57 -0800)]
DO NOT MERGE - Merge PPRL.190305.001 into stage-aosp-master
Bug:
127812889
Change-Id: I433e1bf1f64c8be7187bda2c22a2554a936e4d43
Ajay Panicker [Fri, 14 Dec 2018 22:55:02 +0000 (14:55 -0800)]
DO NOT MERGE: Use a weak pointer to deliver updates to AVRCP devices.
If a device disconnects right before a update message gets queued, the
device becomes null and there is a crash when the callback for the
update executes on the disconnected device. This patch switches the
device reference from being Unretained to using a weak pointer so that
the callback just doesn't execute if the device is disconnected.
Bug:
120431125
Bug:
120445479
Test: Use the same test as b/
120477414 as that bug causes a disconnect
at the same time as a media update.
Change-Id: I1dcc08e5c9866106e7ec0dad52505e34b42da600
Martin Brabham [Fri, 8 Mar 2019 23:00:39 +0000 (15:00 -0800)]
Merge "osi: explicitly release wakelock during turn off" am:
b5414b30a0
am:
8b130a9a0d
Change-Id: I224709754de1c2318923168c3fbc9d5ea928a6e0
Martin Brabham [Fri, 8 Mar 2019 22:33:29 +0000 (14:33 -0800)]
Merge "osi: explicitly release wakelock during turn off"
am:
b5414b30a0
Change-Id: Ib3b886cfca8edc7faf4a3484e3fa80e14d799616
Treehugger Robot [Fri, 8 Mar 2019 22:11:05 +0000 (22:11 +0000)]
Merge "osi: explicitly release wakelock during turn off"
android-build-team Robot [Fri, 8 Mar 2019 18:50:37 +0000 (18:50 +0000)]
Snap for
5240760 from
b9dd3863033facdd8608904e4dd59ff3cc52871b to pi-platform-release
Change-Id: I8098c6f610e684be5b84a984b163088d255420b8
Ajay Panicker [Fri, 14 Dec 2018 22:55:02 +0000 (14:55 -0800)]
Use a weak pointer to deliver updates to AVRCP devices.
If a device disconnects right before a update message gets queued, the
device becomes null and there is a crash when the callback for the
update executes on the disconnected device. This patch switches the
device reference from being Unretained to using a weak pointer so that
the callback just doesn't execute if the device is disconnected.
Bug:
120431125
Test: Use the same test as b/
120477414 as that bug causes a disconnect
at the same time as a media update.
Change-Id: I1dcc08e5c9866106e7ec0dad52505e34b42da600
Hansong Zhang [Fri, 8 Mar 2019 01:20:23 +0000 (17:20 -0800)]
[automerger skipped] [automerger] DO NOT MERGE Fix length for L2CAP config type EXT FLOW am:
1fa0f29dbe am:
066e401178 am:
c97a452b7c am:
a2661852ce skipped:
3c413e34d2 am:
ec1eca1dfb am:
294210a1a2 am:
aa03b49791 -s ours
am:
3b4b1a0828
Change-Id: If82c4742558c51a3bb50d9c1b2809ec6980241f4
Hansong Zhang [Fri, 8 Mar 2019 00:39:34 +0000 (16:39 -0800)]
[automerger skipped] [automerger] DO NOT MERGE Fix length for L2CAP config type EXT FLOW am:
1fa0f29dbe am:
066e401178 am:
c97a452b7c am:
a2661852ce skipped:
3c413e34d2 am:
ec1eca1dfb am:
294210a1a2
am:
aa03b49791 -s ours
am skip reason: subject contains skip directive
Change-Id: I640047c7412d16eb5e48e15027eec92aeea13f5e
Hansong Zhang [Fri, 8 Mar 2019 00:09:35 +0000 (16:09 -0800)]
[automerger] DO NOT MERGE Fix length for L2CAP config type EXT FLOW am:
1fa0f29dbe am:
066e401178 am:
c97a452b7c am:
a2661852ce skipped:
3c413e34d2 am:
ec1eca1dfb
am:
294210a1a2
Change-Id: I770c49c0620e4267d2134abbecc8b55193149227
Hansong Zhang [Thu, 7 Mar 2019 23:22:20 +0000 (15:22 -0800)]
[automerger] DO NOT MERGE Fix length for L2CAP config type EXT FLOW am:
1fa0f29dbe am:
066e401178 am:
c97a452b7c am:
a2661852ce skipped:
3c413e34d2
am:
ec1eca1dfb
Change-Id: I8d891af970d9eea45384eff2967544adb6ffafc7
Jakub Pawlowski [Thu, 7 Mar 2019 23:08:11 +0000 (15:08 -0800)]
[automerger skipped] Clear the link key when releasing security records
am:
fe73464f09 -s ours
am skip reason: change_id Ia571a2048fa5ca85c45b03b39d398e480aadb55a with SHA1
acb0a7eb17 is in history
Change-Id: I954b5b385d894ca4dfc155a7ef3c3866072c7263
Martin Brabham [Tue, 26 Feb 2019 22:54:58 +0000 (14:54 -0800)]
osi: explicitly release wakelock during turn off
Ensures we release the wakelock when turning off if any module hasn't stopped timers properly
Bug:
123289721
Test: atest net_test_bluetooth
Change-Id: Ibec5c262d2ec33ce22f2c8bb2a9b838e8d6b90a7
Jakub Pawlowski [Tue, 5 Mar 2019 11:10:02 +0000 (12:10 +0100)]
Clear the link key when releasing security records
Test: compilation
Bug:
127479372
Change-Id: Ia571a2048fa5ca85c45b03b39d398e480aadb55a
Merged-In: Ia571a2048fa5ca85c45b03b39d398e480aadb55a
(cherry picked from commit
acb0a7eb17ec327b46071bc482c8b9687b730fdc)
Joseph Pirozzo [Thu, 7 Mar 2019 19:40:35 +0000 (11:40 -0800)]
AVRCP Controller Play Position Changed am:
6f22c6e83c
am:
0b588803c8
Change-Id: I743f38c588c028ceb5f2e1053cbe04d4ac498242
Joseph Pirozzo [Thu, 7 Mar 2019 19:13:18 +0000 (11:13 -0800)]
AVRCP Controller Play Position Changed
am:
6f22c6e83c
Change-Id: I0aeb82a4a8fc1619626d1b546adb8803bd2c1525
OSDN Git Service
