OSDN Git Service
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
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
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
Xin Li [Wed, 13 Mar 2019 02:26:03 +0000 (02:26 +0000)]
Merge "DO NOT MERGE - Merge PPRL.190305.001 into master"
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
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
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"
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:46:26 +0000 (10:46 -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:
683b34a0a3 -s ours
am skip reason: subject contains skip directive
Change-Id: I391c7f88a8d5aebe41ce789216c04669665193fa
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:43:04 +0000 (09:43 -0700)]
[automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190305.001 into stage-aosp-master" into stage-aosp-master am:
d41cac112d -s ours
am:
4aab1080b5 -s ours
am skip reason: subject contains skip directive
Change-Id: I18cc16b5dc4755e873df337e598072ec904e8650
The Android Open Source Project [Mon, 11 Mar 2019 16:34:36 +0000 (09:34 -0700)]
[automerger skipped] DO NOT MERGE - Merge PPRL.190305.001 into stage-aosp-master am:
4a6c7d8b2e -s ours
am:
35fa690fed -s ours
am skip reason: subject contains skip directive
Change-Id: I9022526dc70d2d99a69f31cd814d70cd3c729dfb
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:38:42 +0000 (16:38 -0800)]
Merge "Use a weak pointer to deliver updates to AVRCP devices." am:
80eeba2af3 am:
b37ce65dce
am:
8e3c86adc1
Change-Id: I375f5087aafc2223d60517562ba7dc38e17f2d85
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:07:30 +0000 (15:07 -0800)]
Merge "osi: explicitly release wakelock during turn off" am:
b5414b30a0 am:
8b130a9a0d
am:
e6964a2c67
Change-Id: Ia51914689a21b6ebc092b8333e7c1e4321476eb4
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 02:14:11 +0000 (18:14 -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
am:
bb77375213 -s ours
am skip reason: subject contains skip directive
Change-Id: Ie12e14475f00f24b3708a20b5e6ad0caf7e84cd9
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:21:21 +0000 (15:21 -0800)]
[automerger skipped] Clear the link key when releasing security records am:
fe73464f09 -s ours
am:
a91915145f -s ours
am skip reason: change_id Ia571a2048fa5ca85c45b03b39d398e480aadb55a with SHA1
acb0a7eb17 is in history
Change-Id: I2e3cccb33a8ccead90146c7b5f45f0a89de782f9
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 20:19:01 +0000 (12:19 -0800)]
AVRCP Controller Play Position Changed am:
6f22c6e83c am:
0b588803c8
am:
3eec21e95e
Change-Id: Ie0bffa29e97ce4d87db3d66689df98dd93c05719
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
Android Build Merger (Role) [Thu, 7 Mar 2019 18:51:47 +0000 (18:51 +0000)]
[automerger] DO NOT MERGE Fix length for L2CAP config type EXT FLOW am:
1fa0f29dbe am:
066e401178 am:
c97a452b7c am:
a2661852ce skipped:
3c413e34d2
Change-Id: I5f0ad541fa702233322b96e5dd5c9d53233dea94
Android Build Merger (Role) [Thu, 7 Mar 2019 18:51:45 +0000 (18:51 +0000)]
[automerger] DO NOT MERGE Fix length for L2CAP config type EXT FLOW am:
1fa0f29dbe am:
066e401178 am:
c97a452b7c am:
a2661852ce
Change-Id: I6e56a6c02e5d7a3e23832c8e24550ae626a4dc6a
Android Build Merger (Role) [Thu, 7 Mar 2019 18:51:43 +0000 (18:51 +0000)]
[automerger] DO NOT MERGE Fix length for L2CAP config type EXT FLOW am:
1fa0f29dbe am:
066e401178 am:
c97a452b7c
Change-Id: I747585195e3cf9137449dc777b64174a4a93c1f3
Android Build Merger (Role) [Thu, 7 Mar 2019 18:51:42 +0000 (18:51 +0000)]
[automerger] DO NOT MERGE Fix length for L2CAP config type EXT FLOW am:
1fa0f29dbe am:
066e401178
Change-Id: Ie35b3f093063898bc9d8cab84d221194f1ca007b
Android Build Merger (Role) [Thu, 7 Mar 2019 18:51:38 +0000 (18:51 +0000)]
[automerger] DO NOT MERGE Fix length for L2CAP config type EXT FLOW am:
1fa0f29dbe
Change-Id: I24f0d31be7582e28ba9b96d836cd85bcf7f3ef4c
Hansong Zhang [Thu, 7 Mar 2019 18:50:04 +0000 (10:50 -0800)]
DO NOT MERGE Fix length for L2CAP config type EXT FLOW
Bug:
119870451
Test: POC
Change-Id: I11041dd03caad5569e930ff36b50fc9c2719c57f
Joseph Pirozzo [Thu, 7 Mar 2019 00:00:21 +0000 (16:00 -0800)]
AVRCP Controller Play Position Changed
Implement code to register for the AVRCP notification
EVENT_PLAYBACK_POS_CHANGED such that playback position gets update on
skip to beginning, and during audio scrubbing from phone.
Bug:
119119967
Test: Play music, scrub audio to another position on phone, observe
playback position is in sync.
Change-Id: Ib8459dece7629622649ba6ed340dcd697c700b09
Jakub Pawlowski [Wed, 6 Mar 2019 21:34:53 +0000 (13:34 -0800)]
Fix for connection attempt after connection cancel am:
27870c9803 am:
a9a610dfd2
am:
87a78b9a81
Change-Id: I9afb23a7f44cc4afd9353bd22e033242018aef19
Jakub Pawlowski [Wed, 6 Mar 2019 21:24:14 +0000 (13:24 -0800)]
Fix for connection attempt after connection cancel am:
27870c9803
am:
a9a610dfd2
Change-Id: Ib4f5446a7ef52f768bf5dbc8b5a316e7679f38b0
Jakub Pawlowski [Wed, 6 Mar 2019 21:01:46 +0000 (13:01 -0800)]
Fix for connection attempt after connection cancel
am:
27870c9803
Change-Id: I53d5bce8962f5e3789f0ae41c39bc916ffe85ca7
Jakub Pawlowski [Wed, 6 Mar 2019 11:47:59 +0000 (12:47 +0100)]
Fix for connection attempt after connection cancel
When connection attempt is canceled, we put the transport control block
(p_tcb) into CLOSING state, but we never close or free it.
For LE devices that have not established the connection, it's safe to
go straight to CLOSED state and free the p_tcb.
This issue was introduced during connection manager refactor.
Bug:
127242749
Test: GattConnectTest
Change-Id: I8e45ead9b071c60e95d2e60dcea8afdbaefb92b1
Jakub Pawlowski [Wed, 6 Mar 2019 07:00:08 +0000 (23:00 -0800)]
Merge "Clear the link key when releasing security records" am:
6c228c5b58 am:
581a08707f
am:
e890913288
Change-Id: I7be696c7cd312b9e0046cae7016193f58ad372a2
Jakub Pawlowski [Wed, 6 Mar 2019 06:56:02 +0000 (22:56 -0800)]
Merge "Clear the link key when releasing security records" am:
6c228c5b58
am:
581a08707f
Change-Id: Id1a605ee6ada4cbc2c7e73b0012cf7835cab6308
Jakub Pawlowski [Wed, 6 Mar 2019 06:51:59 +0000 (22:51 -0800)]
Merge "Clear the link key when releasing security records"
am:
6c228c5b58
Change-Id: I5989cec3929a07dbbf36d112c329ffb5c2d37433
Jakub Pawlowski [Wed, 6 Mar 2019 06:40:54 +0000 (06:40 +0000)]
Merge "Clear the link key when releasing security records"
Alistair Strachan [Tue, 5 Mar 2019 23:40:35 +0000 (15:40 -0800)]
Merge "Fall back to CLOCK_BOOTTIME if CLOCK_BOOTTIME_ALARM fails" am:
bbec743e47 am:
218c46a761
am:
1f8ce79105
Change-Id: I0dc49924144178b3f36926389a7383ab6531f37f
Alistair Strachan [Tue, 5 Mar 2019 23:19:23 +0000 (15:19 -0800)]
Merge "Fall back to CLOCK_BOOTTIME if CLOCK_BOOTTIME_ALARM fails" am:
bbec743e47
am:
218c46a761
Change-Id: I1c4b43d6a028548748b25ab4852690e9d739e80b
Alistair Strachan [Tue, 5 Mar 2019 23:04:15 +0000 (15:04 -0800)]
Merge "Fall back to CLOCK_BOOTTIME if CLOCK_BOOTTIME_ALARM fails"
am:
bbec743e47
Change-Id: I831f7c3f113b807e4ba73169d3ad00d2770e02b8
Treehugger Robot [Tue, 5 Mar 2019 20:57:51 +0000 (20:57 +0000)]
Merge "Fall back to CLOCK_BOOTTIME if CLOCK_BOOTTIME_ALARM fails"
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
Fukai Wang [Tue, 5 Mar 2019 14:58:34 +0000 (06:58 -0800)]
Add btm_free() to clean up btm properly am:
91b7bb254f am:
10a7c19849
am:
3530855f83
Change-Id: Ie4d33c0ea84a704c4a38e821fd8fc40f1cdb5933
Fukai Wang [Tue, 5 Mar 2019 14:54:34 +0000 (06:54 -0800)]
Add btm_free() to clean up btm properly am:
91b7bb254f
am:
10a7c19849
Change-Id: Ia0c1ac7d7b55861e07ce85b73788a9ef04c629a3
Fukai Wang [Tue, 5 Mar 2019 14:50:23 +0000 (06:50 -0800)]
Add btm_free() to clean up btm properly
am:
91b7bb254f
Change-Id: I8e17143167c49d9b938ee7026aea94ea17a6ec79
Fukai Wang [Wed, 26 Jul 2017 01:35:21 +0000 (09:35 +0800)]
Add btm_free() to clean up btm properly
Test: Run AdapterRepeatedEnableDisable in system/bt/test with
kTestRepeatCount set to 1000.
Change-Id: I6d6650e735697bf97098827b5a9d39552c6616d8
Alistair Strachan [Sat, 2 Mar 2019 01:45:09 +0000 (17:45 -0800)]
Fall back to CLOCK_BOOTTIME if CLOCK_BOOTTIME_ALARM fails
If the cuttlefish device does not have an rtc device (such as the crosvm
VMM) the bt osi layer can promote crashes due to it not being able to
create a CLOCK_BOOTTIME_ALARM timer. Bring back a fallback but enable it
at runtime instead of compile time.
Bug:
126955943
Test: run with cuttlefish
Change-Id: I3ab0282b3e8fde776aa7b37d5772c8f62cf957bf
Greg Kaiser [Mon, 4 Mar 2019 20:05:54 +0000 (12:05 -0800)]
Merge "bta_jv_act: Avoid writing through NULL/freed pointer" am:
bed859917b am:
4e47db47af
am:
f0fb653d0f
Change-Id: Iba722a25e24b1a4427749ca7258dbf969b3fa668
Greg Kaiser [Mon, 4 Mar 2019 19:59:00 +0000 (11:59 -0800)]
Merge "bta_jv_act: Avoid potential NULL dereference" am:
b81c6e7f04 am:
e4f250f1c8
am:
b9a970b195
Change-Id: Iac54f6065db0fd4c4466e2891f93b92e09d8522d
Greg Kaiser [Mon, 4 Mar 2019 19:46:10 +0000 (11:46 -0800)]
Merge "bta_jv_act: Avoid writing through NULL/freed pointer" am:
bed859917b
am:
4e47db47af
Change-Id: I647d3c7f43633ee179575570a71242a43cebda35
Greg Kaiser [Mon, 4 Mar 2019 19:44:52 +0000 (11:44 -0800)]
Merge "bta_jv_act: Avoid potential NULL dereference" am:
b81c6e7f04
am:
e4f250f1c8
Change-Id: Ib7f39147e8bc73b09668e0728fdc2ceb88497c30
Greg Kaiser [Mon, 4 Mar 2019 19:33:20 +0000 (11:33 -0800)]
Merge "bta_jv_act: Avoid writing through NULL/freed pointer"
am:
bed859917b
Change-Id: I30585d79f53f3647aa626f268f31cb16e29aaf0c
Greg Kaiser [Mon, 4 Mar 2019 19:32:01 +0000 (11:32 -0800)]
Merge "bta_jv_act: Avoid potential NULL dereference"
am:
b81c6e7f04
Change-Id: I6dcb774ab24978fb56d9d1e9c502e4fccad3dfd8
Treehugger Robot [Mon, 4 Mar 2019 18:49:24 +0000 (18:49 +0000)]
Merge "bta_jv_act: Avoid writing through NULL/freed pointer"
Treehugger Robot [Mon, 4 Mar 2019 18:45:11 +0000 (18:45 +0000)]
Merge "bta_jv_act: Avoid potential NULL dereference"
Stanley Tng [Mon, 4 Mar 2019 16:57:56 +0000 (08:57 -0800)]
Merge "When stopping Hearing Aids, send Stop cmd to devices" am:
937988bbf8 am:
9257bc15a4
am:
6f4e7ee0d2
Change-Id: Idd2b9b6e5eb880034a9622bfaeebfdfdb5f76b2a
Stanley Tng [Mon, 4 Mar 2019 16:48:25 +0000 (08:48 -0800)]
Merge "When stopping Hearing Aids, send Stop cmd to devices" am:
937988bbf8
am:
9257bc15a4
Change-Id: I5cd00921b50fa4a5bd1e70d3234891c756e43a77
Stanley Tng [Mon, 4 Mar 2019 16:39:15 +0000 (08:39 -0800)]
Merge "When stopping Hearing Aids, send Stop cmd to devices"
am:
937988bbf8
Change-Id: I08f9b717d39d3dec7589b407579ad51450ae25fe
Treehugger Robot [Mon, 4 Mar 2019 16:20:17 +0000 (16:20 +0000)]
Merge "When stopping Hearing Aids, send Stop cmd to devices"
Cheney Ni [Sat, 2 Mar 2019 01:21:21 +0000 (17:21 -0800)]
[automerger skipped] Merge "Reland BluetoothAudio HAL: flip to be enabled by default" am:
86c4e25f06 am:
3f8fc33318
am:
e5261a33d9 -s ours
am skip reason: change_id I936e6c9e9fa3e35508ec435dcff8fa54b3f4d883 with SHA1
e53427f238 is in history
Change-Id: I71a7a00d7d4d65a34db8661f2809c56c6565df31
Cheney Ni [Sat, 2 Mar 2019 01:12:31 +0000 (17:12 -0800)]
Merge "Reland BluetoothAudio HAL: flip to be enabled by default" am:
86c4e25f06
am:
3f8fc33318
Change-Id: I56fafc72f283025c13b60807217fb6a5d07509bf
Stanley Tng [Sat, 2 Mar 2019 00:54:11 +0000 (16:54 -0800)]
When stopping Hearing Aids, send Stop cmd to devices
This fixes the bug where the Stop command is not send to the Hearing
Aids devices which switching audio away from Hearing Aid.
Bug:
126465843
Test: Manual switching between A2DP and Hearing Aids while
playing audio.
Change-Id: Ifd8eaed7496e7e16c3948683c518d7627824d3e8
Cheney Ni [Sat, 2 Mar 2019 00:58:13 +0000 (16:58 -0800)]
Merge "Reland BluetoothAudio HAL: flip to be enabled by default"
am:
86c4e25f06
Change-Id: I2bb2b5e4665ad38da3704ec73fc26704d6454748
Treehugger Robot [Sat, 2 Mar 2019 00:37:41 +0000 (00:37 +0000)]
Merge "Reland BluetoothAudio HAL: flip to be enabled by default"
Greg Kaiser [Fri, 1 Mar 2019 13:54:56 +0000 (05:54 -0800)]
bta_jv_act: Avoid writing through NULL/freed pointer
Before writing to 't->init_called', we know that 't' might be
NULL (there's an explicit check), so we add another check here
to assure it's not NULL. Furthermore, we're possibly freeing
't' prior to writing to 't->init_called'. So we set 't' NULL
in that case, so our new NULL check will let us avoid corrupting
memory we no longer own.
Test: TreeHugger
Change-Id: Iaa246d5190f5f99610dace24707e74a846df3cf3
Greg Kaiser [Fri, 1 Mar 2019 13:34:26 +0000 (05:34 -0800)]
bta_jv_act: Avoid potential NULL dereference
When 'tc' is NULL (a condition we check for), 't' is never
set to a non-NULL value, yet is still dereferenced. We move
our NULL check of 't' to make this code safe.
Test: TreeHugger
Change-Id: Ibfea74963dd763401ea18ccdd24a51ecd0baefc5
Cheney Ni [Fri, 1 Mar 2019 03:05:42 +0000 (19:05 -0800)]
[automerger skipped] Merge "Reland Start the media encoder for a successful BTA_AV_START_EVT" am:
a55c26ab5f am:
5b140b11d0
am:
185fbfb58e -s ours
am skip reason: change_id Ieb479fd6f42da1bf37f8f32af7794d86e04cac1b with SHA1
7036662ec1 is in history
Change-Id: Ic4800e471d982f686af824c0c4d4f0dd15371e4b
Cheney Ni [Fri, 1 Mar 2019 02:56:52 +0000 (18:56 -0800)]
Merge "Reland Start the media encoder for a successful BTA_AV_START_EVT" am:
a55c26ab5f
am:
5b140b11d0
Change-Id: I33775fe6b07b73cdd8ee591e3730588bb7e69c8f
Cheney Ni [Fri, 1 Mar 2019 02:48:43 +0000 (18:48 -0800)]
Merge "Reland Start the media encoder for a successful BTA_AV_START_EVT"
am:
a55c26ab5f
Change-Id: Iec8d2e35dfc2eae1c841069b372de81079928f05
Treehugger Robot [Fri, 1 Mar 2019 02:33:47 +0000 (02:33 +0000)]
Merge "Reland Start the media encoder for a successful BTA_AV_START_EVT"
Yi Kong [Fri, 1 Mar 2019 01:32:26 +0000 (17:32 -0800)]
Merge "Fix a bunch of incorrect syntax statements" am:
84cf37a3c4 am:
5809432605
am:
f41b7bec1c
Change-Id: I159ef3d853d241eec29cef7d150b2806aa1e2f9a
Yi Kong [Fri, 1 Mar 2019 01:16:43 +0000 (17:16 -0800)]
Merge "Fix a bunch of incorrect syntax statements" am:
84cf37a3c4
am:
5809432605
Change-Id: Ic82b6dcfb71fe987e345dbe6b52ad94cb996c6f0
Cheney Ni [Sat, 23 Feb 2019 18:14:20 +0000 (02:14 +0800)]
Reland BluetoothAudio HAL: flip to be enabled by default
Bug:
126304229
Test: Switch BluetoothAudio HAL and A2DP offload manully
Change-Id: I936e6c9e9fa3e35508ec435dcff8fa54b3f4d883
Merged-In: I936e6c9e9fa3e35508ec435dcff8fa54b3f4d883
Cheney Ni [Tue, 26 Feb 2019 03:56:25 +0000 (11:56 +0800)]
Reland Start the media encoder for a successful BTA_AV_START_EVT
When phone is A2DP source and receives BTA_AV_START_EVT, we need to
proceed to start the encoder of software or offload, and ack back to
audio HAL. When issue happened, the remote as the AVDTP_START initiator
triggered BTA_AV_START_EVT, and caused we did not start the encoder to
stream the audio. This change simplified the handler of BTA_AV_START_EVT
to always start the encoder for a successful event, and ack to audio HAL
if we are AVDTP initiator.
Bug:
126136429
Test: A2DP play and paused manually on Pixel 2 and Pixel 3
Change-Id: Ieb479fd6f42da1bf37f8f32af7794d86e04cac1b
Merged-In: Ieb479fd6f42da1bf37f8f32af7794d86e04cac1b
Yi Kong [Fri, 1 Mar 2019 00:59:28 +0000 (16:59 -0800)]
Merge "Fix a bunch of incorrect syntax statements"
am:
84cf37a3c4
Change-Id: Ifd68da108a3cfb58322e4bc35f6d15ba0c2f23aa
TreeHugger Robot [Fri, 1 Mar 2019 00:51:41 +0000 (00:51 +0000)]
Merge changes from topic "reland-bluetooth-audio-hal"
* changes:
Reland Start the media encoder for a successful BTA_AV_START_EVT
Reland BluetoothAudio HAL: flip to be enabled by default
Yi Kong [Fri, 1 Mar 2019 00:30:53 +0000 (00:30 +0000)]
Merge "Fix a bunch of incorrect syntax statements"
OSDN Git Service
