OSDN Git Service
Hansong Zhang [Mon, 25 Feb 2019 21:12:34 +0000 (13:12 -0800)]
Merge "clang: Set to 120 characters per line" am:
b228330d0e
am:
a0cd616877
Change-Id: I6f8e27e643a8c9fc7d4432775be85ba2917fb76c
Cheney Ni [Mon, 25 Feb 2019 21:12:02 +0000 (13:12 -0800)]
Don't require A2DP codec information when initialize audio_hal_interface am:
8552e95c46
am:
5024f3c93c
Change-Id: I71af6133894791a2ffe21a0d5c00ac250c224070
Ted Wang [Sat, 23 Feb 2019 07:38:23 +0000 (23:38 -0800)]
Merge "Fix mtu assignment with correct value" into pi-dev
am:
2a1ee659ea
Change-Id: Idb209fa6e679af4bd1418730ecb805dbcd83af95
TreeHugger Robot [Sat, 23 Feb 2019 07:30:06 +0000 (07:30 +0000)]
Merge "Fix mtu assignment with correct value" into pi-dev
Hansong Zhang [Fri, 22 Feb 2019 06:54:07 +0000 (22:54 -0800)]
Merge "clang: Set to 120 characters per line"
am:
b228330d0e
Change-Id: I28e6c28cdc9ec2a56fe0cc4c9d1bf9f7d7c84d5e
Treehugger Robot [Fri, 22 Feb 2019 06:41:12 +0000 (06:41 +0000)]
Merge "clang: Set to 120 characters per line"
vich [Fri, 22 Feb 2019 05:17:57 +0000 (21:17 -0800)]
[automerger skipped] Merge "Do not close dump file descriptor" into pi-dev
am:
fdd0bb033f -s ours
am skip reason: change_id Id351b5429cb17b48e37313850a363d739d78c4a1 with SHA1
e8ab460e35 is in history
Change-Id: Ic52d4819823fe29d07f4ae668e7c8f78e2133d45
TreeHugger Robot [Fri, 22 Feb 2019 05:04:53 +0000 (05:04 +0000)]
Merge "Do not close dump file descriptor" into pi-dev
Aiswarya Cyriac [Thu, 21 Feb 2019 23:53:59 +0000 (15:53 -0800)]
Merge "Fix for Bluetooth device name is resetting to default name after reboot" into pi-dev
am:
80c748c407
Change-Id: If88101d9dd7c3dc8427f497674602fdd50b8b9fc
TreeHugger Robot [Thu, 21 Feb 2019 23:44:19 +0000 (23:44 +0000)]
Merge "Fix for Bluetooth device name is resetting to default name after reboot" into pi-dev
Hansong Zhang [Wed, 9 Jan 2019 03:39:22 +0000 (19:39 -0800)]
clang: Set to 120 characters per line
Modern terminals and text editors can display 120 characters
Test: compile
Change-Id: I799de73e622d045ba997e749eb15d5f786764fdd
Cheney Ni [Thu, 21 Feb 2019 19:54:46 +0000 (11:54 -0800)]
Don't require A2DP codec information when initialize audio_hal_interface
am:
8552e95c46
Change-Id: I4f64760c7f30ca670637d7dfecea7b70e015054f
Cheney Ni [Thu, 21 Feb 2019 11:54:10 +0000 (19:54 +0800)]
Don't require A2DP codec information when initialize audio_hal_interface
Before set active device, it is normal that can't get the current codec
information, and will be setup later. If we query the codec and break
the init, it will cause the stack can't use Bluetooth Audio HAL for
A2DP, so remove here.
Bug:
125245738
Test: Connect / disconnect multiple A2DP manually when playing
Change-Id: Ic5493141cfba60115783c03fac4faf56a7a64b07
Kim Schulz [Wed, 20 Feb 2019 21:16:51 +0000 (13:16 -0800)]
Fix crash when more than 2 PHYs specified for connection am:
d20051b26a
am:
8919facfd7
Change-Id: I1856eddfa20e13b24fd3eaad4530d9fab4cb9752
Cheney Ni [Wed, 20 Feb 2019 21:09:32 +0000 (13:09 -0800)]
Merge changes I58ceea50,I73319018 am:
fcbe660320
am:
abfb80dacb
Change-Id: Icd5788b1aaec2cf2d878423bb1db81fec96bd752
Kim Schulz [Wed, 20 Feb 2019 20:44:47 +0000 (12:44 -0800)]
Fix crash when more than 2 PHYs specified for connection
am:
d20051b26a
Change-Id: I05749d14830cf2217dab8ae8fc30660cc30b2950
Cheney Ni [Wed, 20 Feb 2019 20:28:19 +0000 (12:28 -0800)]
Merge changes I58ceea50,I73319018
am:
fcbe660320
Change-Id: Id62babcd79cd2565e3a537b838dc3814dfeb048e
Kim Schulz [Wed, 20 Feb 2019 15:33:38 +0000 (16:33 +0100)]
Fix crash when more than 2 PHYs specified for connection
Bug:
124793834
Change-Id: Ide304e22d4b390f252ba9577aeb5d9a67fa1a1cd
Xin Li [Wed, 20 Feb 2019 17:31:23 +0000 (09:31 -0800)]
[automerger skipped] DO NOT MERGE - Merge PPRL.190205.001 into master am:
b5d88246be -s ours
am:
74e82c1777 -s ours
am skip reason: subject contains skip directive
Change-Id: Ie26f39b03fe7b51d92f3da9e4fdd2c1ecc6ba270
Treehugger Robot [Wed, 20 Feb 2019 17:30:52 +0000 (17:30 +0000)]
Merge changes I58ceea50,I73319018
* changes:
Check A2DP UIPC state before feeding data
Break the control early when the stream state of Bluetooth Audio changed
Xin Li [Wed, 20 Feb 2019 16:54:51 +0000 (08:54 -0800)]
[automerger skipped] DO NOT MERGE - Merge PPRL.190205.001 into master
am:
b5d88246be -s ours
am skip reason: subject contains skip directive
Change-Id: I7fbd5d8dca44de835df547ec2336571b3ee6f2d0
Cheney Ni [Wed, 20 Feb 2019 13:41:33 +0000 (21:41 +0800)]
Check A2DP UIPC state before feeding data
When using the new Bluetooth Audio HAL, A2DP UIPC won't be initialized
and can't be accessed. This change checks the UIPC is valid before
accessing, and prevents unexpected SIGSEGV.
Bug:
124645960
Test: Start / pause A2DP manually
Change-Id: I58ceea503d0c159817167bb3ca3b99b6f933bf23
Cheney Ni [Wed, 20 Feb 2019 06:27:06 +0000 (14:27 +0800)]
Break the control early when the stream state of Bluetooth Audio changed
When switching active device, the Bluetooth stack would first stop the
datapath while the audio HAL was still streaming, and the failure by
busy was returned to HAL. Since the control status was returned, HAL
should not ignore the result or kept waiting, because the stack wouldn't
queue the control.
Bug:
124838461
Test: switch the codec and active device manually
Change-Id: I73319018f726590c52c07547af90fac57114b58a
Xin Li [Mon, 18 Feb 2019 23:58:54 +0000 (15:58 -0800)]
DO NOT MERGE - Merge PPRL.190205.001 into master
Bug:
124234733
Change-Id: I260dc329f1d83ef8a9cab7e9caee32ba47277477
Satish kumar sugasi [Mon, 18 Feb 2019 03:15:25 +0000 (19:15 -0800)]
Merge "Add support for a2dp offload HAL ver2.0" am:
10cad005f5
am:
f7fe77da3c
Change-Id: I3c7d70aac14c1544a244b7dcb91c6bdb1280b491
Satish kumar sugasi [Mon, 18 Feb 2019 03:12:19 +0000 (19:12 -0800)]
Merge "Add support for a2dp offload HAL ver2.0"
am:
10cad005f5
Change-Id: Ic77b64e6703e89599399c8f857647d58c29d3310
Treehugger Robot [Mon, 18 Feb 2019 03:01:45 +0000 (03:01 +0000)]
Merge "Add support for a2dp offload HAL ver2.0"
Hansong Zhang [Sat, 16 Feb 2019 04:25:52 +0000 (20:25 -0800)]
Merge "Rename a2dp_software_encoding to a2dp_encoding" am:
ad392e481f
am:
8994b9c6d3
Change-Id: I22e9e6d052870e04aae0839df13b049d1ade1422
Hansong Zhang [Sat, 16 Feb 2019 04:10:36 +0000 (20:10 -0800)]
Merge "Rename a2dp_software_encoding to a2dp_encoding"
am:
ad392e481f
Change-Id: I24ca935afc634a93f62ed9b72ea23bbe244cece6
Treehugger Robot [Sat, 16 Feb 2019 04:05:34 +0000 (04:05 +0000)]
Merge "Rename a2dp_software_encoding to a2dp_encoding"
Satish kumar sugasi [Thu, 7 Feb 2019 22:40:35 +0000 (14:40 -0800)]
Add support for a2dp offload HAL ver2.0
Test: manual
Change-Id: Id5323b3c22d6aff6c194e3835eefeb22e32145c9
Hansong Zhang [Sat, 16 Feb 2019 00:19:44 +0000 (16:19 -0800)]
Rename a2dp_software_encoding to a2dp_encoding
Change-Id: Ief1c8cb1a768902a719c4956947d16081ad20add
Cheney Ni [Fri, 15 Feb 2019 19:37:58 +0000 (11:37 -0800)]
Remove unnecessary unlock am:
9ddb2adeb6
am:
8e25ada513
Change-Id: I130a1e086998a57d46c81e00c3323c40027e6c01
Cheney Ni [Fri, 15 Feb 2019 19:27:27 +0000 (11:27 -0800)]
Remove unnecessary unlock
am:
9ddb2adeb6
Change-Id: Ibba705841e26a19698ce8405e3335dd375be2b31
Cheney Ni [Fri, 15 Feb 2019 15:47:15 +0000 (23:47 +0800)]
Remove unnecessary unlock
Bug:
124480689
Test: manual A2DP test
Change-Id: Id4cd4e2c97a9c4ed7219d8f1b4c15bf82b1031be
Xin Li [Thu, 14 Feb 2019 22:46:10 +0000 (14:46 -0800)]
[automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master
am:
bd61251896 -s ours
am skip reason: subject contains skip directive
Change-Id: Id88c0ed407bad40bed42766ae46a3b5d8dcc4f30
Xin Li [Thu, 14 Feb 2019 00:41:16 +0000 (16:41 -0800)]
DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master
Bug:
124234733
Change-Id: I2ad9e0da67801687409b5e755d2436ba3c99770a
Joseph Pirozzo [Wed, 13 Feb 2019 20:25:11 +0000 (12:25 -0800)]
Merge "Flush buffer to filesystem before fsync" am:
2cc25459dd
am:
61f1e9c870
Change-Id: Iebf35fc873b11c32a50623284be531198249777c
Joseph Pirozzo [Wed, 13 Feb 2019 20:20:40 +0000 (12:20 -0800)]
Merge "Flush buffer to filesystem before fsync"
am:
2cc25459dd
Change-Id: Ic12f4a62777d89a4bc01442ab1864c1566535614
Joseph Pirozzo [Wed, 13 Feb 2019 20:07:41 +0000 (20:07 +0000)]
Merge "Flush buffer to filesystem before fsync"
Joseph Pirozzo [Fri, 8 Feb 2019 21:38:27 +0000 (13:38 -0800)]
Flush buffer to filesystem before fsync
If power is lost immediately after updating a config file it is possible
to save an empty file in its place. By flushing the stream buffer to
the filesystem before flushing the filesystem to the disk this risk is
mitigated;
Bug:
122607444
Test: Update Bluetooth Device name and interrupt power to device.
Change-Id: Iaf89c4d9c594e925507e713a9febbf23a7cdae43
Jack He [Sat, 9 Feb 2019 09:42:52 +0000 (01:42 -0800)]
Merge "Metrics: Log manfuacturer information from Device ID profile to statsd" am:
3894d1f0e6
am:
7c220d5a61
Change-Id: I4bf33c1240d07f946dafbb4809ea543e28548e49
Jack He [Sat, 9 Feb 2019 09:39:00 +0000 (01:39 -0800)]
Merge "Metrics: Log manfuacturer information from Device ID profile to statsd"
am:
3894d1f0e6
Change-Id: Ia1b71faa25a6f1544089e7f228363f5555292925
Treehugger Robot [Sat, 9 Feb 2019 09:29:24 +0000 (09:29 +0000)]
Merge "Metrics: Log manfuacturer information from Device ID profile to statsd"
Jack He [Sat, 9 Feb 2019 04:32:47 +0000 (20:32 -0800)]
Merge "Metrics: Log L2CAP and RFCOMM socket connection state changes to statsd" am:
b8f9808ea5
am:
4be7f26087
Change-Id: Ifef27b91d5e3d158f2f5adcb95ba80ee9c0d4be6
Jack He [Sat, 9 Feb 2019 04:18:22 +0000 (20:18 -0800)]
Merge "Metrics: Log L2CAP and RFCOMM socket connection state changes to statsd"
am:
b8f9808ea5
Change-Id: I12a2985a5c5f5d93c65c077de6abb0ad00adb7d8
Treehugger Robot [Sat, 9 Feb 2019 04:09:45 +0000 (04:09 +0000)]
Merge "Metrics: Log L2CAP and RFCOMM socket connection state changes to statsd"
android-build-team Robot [Sat, 9 Feb 2019 02:19:28 +0000 (02:19 +0000)]
Snap for
5180536 from
6f2759c64311b505b1ddc73e2bfc9f0330845780 to pi-platform-release
Change-Id: Ia9fad0673602c58b504e41515cfe515e751fa848
Jack He [Thu, 7 Feb 2019 05:53:41 +0000 (21:53 -0800)]
Metrics: Log manfuacturer information from Device ID profile to statsd
Bug:
112969790
Test: make, test drive with statsd
Change-Id: Ie22aaad07037f97017186ad1f1d9ad124e4756c0
Jack He [Thu, 7 Feb 2019 04:24:24 +0000 (20:24 -0800)]
Metrics: Log L2CAP and RFCOMM socket connection state changes to statsd
* Log L2CAP LE Coc, L2CAP BREDR, and RFCOMM socket connection state
changes, including port number, socket type, connection states,
number of bytes sent and received, server port number, uid of socket
owner
* Address is empty if this is a server port
Bug:
112969790
Test: make, test drive with statsd
Change-Id: Ic0ee93a6d9e4fa4109ddb89dea5e92907c49f2fc
Ugo Yu [Fri, 8 Feb 2019 20:47:56 +0000 (12:47 -0800)]
[automerger skipped] Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into oc-dev am:
99495df519 -s ours am:
8d550cccd6 -s ours am:
8500500386 -s ours
am:
5980eefcfb -s ours
am skip reason: change_id I023713e07308bfc0e5bb8d67f386bcc50f6a0f85 with SHA1
dc14eb8ba0 is in history
Change-Id: Ie6310a5c45da530dec6face297e14bb544314a87
Ugo Yu [Fri, 8 Feb 2019 20:46:41 +0000 (12:46 -0800)]
[automerger skipped] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
0989441858 -s ours am:
a6d6406255 -s ours am:
feeb53795a -s ours
am:
e14f845fac -s ours
am skip reason: change_id I023713e07308bfc0e5bb8d67f386bcc50f6a0f85 with SHA1
dc14eb8ba0 is in history
Change-Id: I6e5653ea9c7e25d17dac4a73842a4e3b573d5521
Ugo Yu [Fri, 8 Feb 2019 20:42:30 +0000 (12:42 -0800)]
[automerger skipped] Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into oc-dev am:
99495df519 -s ours am:
8d550cccd6 -s ours
am:
8500500386 -s ours
am skip reason: subject contains skip directive
Change-Id: I4f30022298edd7521c895bdceb743662e915b229
Ugo Yu [Fri, 8 Feb 2019 20:41:07 +0000 (12:41 -0800)]
[automerger skipped] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
0989441858 -s ours am:
a6d6406255 -s ours
am:
feeb53795a -s ours
am skip reason: subject contains skip directive
Change-Id: Ie86e28c3ee0c779e9f4df6a1279750e67765eec9
Ugo Yu [Fri, 8 Feb 2019 20:38:28 +0000 (12:38 -0800)]
[automerger skipped] Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into oc-dev am:
99495df519 -s ours
am:
8d550cccd6 -s ours
am skip reason: change_id I023713e07308bfc0e5bb8d67f386bcc50f6a0f85 with SHA1
f3681c8616 is in history
Change-Id: Iaf7c1aadcfd65ed6a82b0c3bc98ff121046f70d2
Ugo Yu [Fri, 8 Feb 2019 20:37:26 +0000 (12:37 -0800)]
[automerger skipped] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
0989441858 -s ours
am:
a6d6406255 -s ours
am skip reason: change_id I023713e07308bfc0e5bb8d67f386bcc50f6a0f85 with SHA1
f3681c8616 is in history
Change-Id: Ie5679c43d4e59f3028a115558763baae8d31ec73
Ugo Yu [Fri, 8 Feb 2019 20:34:11 +0000 (12:34 -0800)]
[automerger skipped] Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into oc-dev
am:
99495df519 -s ours
am skip reason: change_id I023713e07308bfc0e5bb8d67f386bcc50f6a0f85 with SHA1
0989441858 is in history
Change-Id: I6fb78cdd8f4c748d6cafa85bdb1f8f60d676373b
Ugo Yu [Fri, 8 Feb 2019 20:33:37 +0000 (12:33 -0800)]
[automerger skipped] DO NOT MERGE Separate SDP procedure from bonding state (1/2)
am:
0989441858 -s ours
am skip reason: change_id I023713e07308bfc0e5bb8d67f386bcc50f6a0f85 with SHA1
edd7e731ed is in history
Change-Id: Ied8e02f8c14ed6190cc9baebf688359d682b6d00
TreeHugger Robot [Fri, 8 Feb 2019 20:19:42 +0000 (20:19 +0000)]
Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into oc-dev
Ugo Yu [Fri, 8 Feb 2019 08:18:21 +0000 (00:18 -0800)]
Merge changes from topic "am-
43952131-a4db-4e42-bfef-
2d44a29b3fac" into oc-dev am:
c59317a10a am:
d73d5ace07 am:
0cd9890f74
am:
02bf171fb2
Change-Id: I0392075e25fa78dfb35a253f90ee9e76ae0d93e7
Ugo Yu [Fri, 8 Feb 2019 08:14:17 +0000 (00:14 -0800)]
Merge changes from topic "am-
43952131-a4db-4e42-bfef-
2d44a29b3fac" into oc-dev am:
c59317a10a am:
d73d5ace07
am:
0cd9890f74
Change-Id: I80a5aea488949c646baf1e7f514878ec1cba38e3
Ugo Yu [Fri, 8 Feb 2019 08:10:13 +0000 (00:10 -0800)]
Merge changes from topic "am-
43952131-a4db-4e42-bfef-
2d44a29b3fac" into oc-dev am:
c59317a10a
am:
d73d5ace07
Change-Id: I276abc4b3d069c7700e37cf6c2a34df380b07035
Ugo Yu [Fri, 8 Feb 2019 08:06:25 +0000 (00:06 -0800)]
Merge changes from topic "am-
43952131-a4db-4e42-bfef-
2d44a29b3fac" into oc-dev
am:
c59317a10a
Change-Id: I424449c094db3c75d1f76f7d397b7b510d1a8959
TreeHugger Robot [Fri, 8 Feb 2019 07:54:10 +0000 (07:54 +0000)]
Merge changes from topic "am-
43952131-a4db-4e42-bfef-
2d44a29b3fac" into oc-dev
* changes:
[automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
edd7e731ed am:
279c2a1910 am:
c29c3aa408 am:
70ab44a424 skipped:
4e26a1fa5d
[automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
edd7e731ed am:
279c2a1910 am:
c29c3aa408 am:
70ab44a424
[automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
edd7e731ed am:
279c2a1910 am:
c29c3aa408
[automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
edd7e731ed am:
279c2a1910
[automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
edd7e731ed
DO NOT MERGE Separate SDP procedure from bonding state (1/2)
Zach Johnson [Fri, 8 Feb 2019 01:54:11 +0000 (17:54 -0800)]
Update owners am:
5f896dff62
am:
71049c3fc0
Change-Id: I3a0d107c701e81e41ac126a359288e516680b8d9
Zach Johnson [Fri, 8 Feb 2019 01:37:55 +0000 (17:37 -0800)]
Update owners
am:
5f896dff62
Change-Id: I6b148cf88d294200eb8df4d5e068092fe6b5d4b2
Hansong Zhang [Fri, 8 Feb 2019 01:07:43 +0000 (17:07 -0800)]
Merge "btm_proc_smp_cback: Don't access p_dev_rec if freed" into oc-dev am:
4ac889b785 am:
c87e949d53 am:
d59c9ec72e
am:
c3ea071167
Change-Id: I0035c015607c57ce66bc13d820613e0f8aacf003
Ugo Yu [Fri, 8 Feb 2019 01:07:00 +0000 (17:07 -0800)]
[automerger skipped] Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into oc-mr1-dev am:
c48874b71b -s ours
am:
dc9d0d8f17
Change-Id: Iaaccf1ae6b1c600c5d6b3d4b7e525a116db10748
Ugo Yu [Fri, 8 Feb 2019 01:06:02 +0000 (17:06 -0800)]
[automerger skipped] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:
f3681c8616 -s ours
am:
9028a31640
Change-Id: I31a0260c1ff35d1452b214139ccedb0aa0edd6db
Ugo Yu [Fri, 8 Feb 2019 01:05:33 +0000 (17:05 -0800)]
Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into pi-dev
am:
7799b0915e
Change-Id: I840df80cb967dccce932634818c901b79e52b2ff
Hansong Zhang [Fri, 8 Feb 2019 00:50:16 +0000 (16:50 -0800)]
Merge "btm_proc_smp_cback: Don't access p_dev_rec if freed" into oc-dev am:
4ac889b785 am:
c87e949d53
am:
d59c9ec72e
Change-Id: I31957dc7e323364de3529b3375835dd4cb7a501d
Hansong Zhang [Fri, 8 Feb 2019 00:46:11 +0000 (16:46 -0800)]
Merge "btm_proc_smp_cback: Don't access p_dev_rec if freed" into oc-dev am:
4ac889b785
am:
c87e949d53
Change-Id: I6875480db5a714d721d20ead2111627f4ab5a68e
Ugo Yu [Fri, 8 Feb 2019 00:44:52 +0000 (16:44 -0800)]
[automerger skipped] Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into oc-mr1-dev
am:
c48874b71b -s ours
am skip reason: subject contains skip directive
Change-Id: Ibcaf4a7d743ec0cfeebb8aecc7bab2bf3b88615d
Ugo Yu [Fri, 8 Feb 2019 00:44:14 +0000 (16:44 -0800)]
[automerger skipped] DO NOT MERGE Separate SDP procedure from bonding state (1/2)
am:
f3681c8616 -s ours
am skip reason: subject contains skip directive
Change-Id: I6a7d8107caa959212e0d93e708dd87851199a2c8
Hansong Zhang [Fri, 8 Feb 2019 00:42:12 +0000 (16:42 -0800)]
Merge "btm_proc_smp_cback: Don't access p_dev_rec if freed" into oc-dev
am:
4ac889b785
Change-Id: I3a99684487593468b89948aa9d3be99e5ed705f4
TreeHugger Robot [Fri, 8 Feb 2019 00:31:40 +0000 (00:31 +0000)]
Merge "btm_proc_smp_cback: Don't access p_dev_rec if freed" into oc-dev
TreeHugger Robot [Fri, 8 Feb 2019 00:27:55 +0000 (00:27 +0000)]
Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into oc-mr1-dev
TreeHugger Robot [Thu, 7 Feb 2019 23:42:23 +0000 (23:42 +0000)]
Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into pi-dev
Zach Johnson [Thu, 7 Feb 2019 23:08:57 +0000 (15:08 -0800)]
Update owners
remove folks not on team anymore, add new folks
Change-Id: Ib5834ecb068b8149b8b8f53373100786d4533ea0
Hansong Zhang [Thu, 7 Feb 2019 21:32:37 +0000 (13:32 -0800)]
Merge changes from topic "am-
5380790e-42fb-4784-96c0-
4412e4fdccd0" into oc-dev am:
e145805974 am:
9b0e9a32bb am:
53e961c220
am:
8c5cac9acf
Change-Id: I8e49f1c168d9fc71279321b0d1b5762af845dee7
Hansong Zhang [Thu, 7 Feb 2019 21:25:32 +0000 (13:25 -0800)]
Merge changes from topic "am-
5380790e-42fb-4784-96c0-
4412e4fdccd0" into oc-dev am:
e145805974 am:
9b0e9a32bb
am:
53e961c220
Change-Id: I9fc3a00e1b38236aaa1016ef0c422fe5303f407b
Hansong Zhang [Thu, 7 Feb 2019 21:21:26 +0000 (13:21 -0800)]
Merge changes from topic "am-
5380790e-42fb-4784-96c0-
4412e4fdccd0" into oc-dev am:
e145805974
am:
9b0e9a32bb
Change-Id: I02f1344805f748024dc28e05fd0afe67a6afb61a
Hansong Zhang [Thu, 7 Feb 2019 21:17:35 +0000 (13:17 -0800)]
Merge changes from topic "am-
5380790e-42fb-4784-96c0-
4412e4fdccd0" into oc-dev
am:
e145805974
Change-Id: Iaa78778cedd6e04d3cf7d009b81a9599658e6583
TreeHugger Robot [Thu, 7 Feb 2019 21:07:56 +0000 (21:07 +0000)]
Merge changes from topic "am-
5380790e-42fb-4784-96c0-
4412e4fdccd0" into oc-dev
* changes:
[automerger] DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed am:
74c6d501ce am:
059e3c77e2 am:
a244a4072c am:
90265d4ee0 skipped:
84ba34d57a
[automerger] DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed am:
74c6d501ce am:
059e3c77e2 am:
a244a4072c am:
90265d4ee0
[automerger] DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed am:
74c6d501ce am:
059e3c77e2 am:
a244a4072c
[automerger] DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed am:
74c6d501ce am:
059e3c77e2
[automerger] DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed am:
74c6d501ce
DO NOT MERGE btm_proc_smp_cback: Don't access p_dev_rec if freed
Myles Watson [Thu, 7 Feb 2019 04:17:16 +0000 (20:17 -0800)]
Merge "Add a ClassOfDevice type" am:
1127b7ca1e
am:
1d4d929b97
Change-Id: I90ba1f5a150a1e21bb0a70c7f91d2c610a14895c
Myles Watson [Thu, 7 Feb 2019 04:13:16 +0000 (20:13 -0800)]
Merge "Add a ClassOfDevice type"
am:
1127b7ca1e
Change-Id: I24c9a22d2dfb000c6778fde7150038445c90b218
Cheney Ni [Thu, 7 Feb 2019 04:05:13 +0000 (20:05 -0800)]
Merge "Add audio channel of Bluetooth Audio Hal v2 for Hearing Aid" am:
d5b9a48dd4
am:
4ba03befa9
Change-Id: Id21a5e868ecc1463431ef7be0d55f04503df3bb9
Treehugger Robot [Thu, 7 Feb 2019 04:04:02 +0000 (04:04 +0000)]
Merge "Add a ClassOfDevice type"
Cheney Ni [Thu, 7 Feb 2019 03:51:29 +0000 (19:51 -0800)]
Merge "Add audio channel of Bluetooth Audio Hal v2 for Hearing Aid"
am:
d5b9a48dd4
Change-Id: I1d553f74fb1c81b9796225cf3a0fba2faa43c6b4
Jack He [Thu, 7 Feb 2019 03:49:56 +0000 (19:49 -0800)]
Merge "Metrics: Log SDP attributes to statsd" am:
56906d7952
am:
39f25666c6
Change-Id: I758d891e86ab6a23559907948fa0e8cdcc9286ac
Jack He [Thu, 7 Feb 2019 03:46:54 +0000 (19:46 -0800)]
Merge "Metrics: Log SDP attributes to statsd"
am:
56906d7952
Change-Id: I0bf9a363b011ad546824b9826b9721e391cf5b5a
Treehugger Robot [Thu, 7 Feb 2019 03:39:00 +0000 (03:39 +0000)]
Merge "Add audio channel of Bluetooth Audio Hal v2 for Hearing Aid"
Treehugger Robot [Thu, 7 Feb 2019 03:35:01 +0000 (03:35 +0000)]
Merge "Metrics: Log SDP attributes to statsd"
Jack He [Sat, 2 Feb 2019 02:30:21 +0000 (18:30 -0800)]
Metrics: Log SDP attributes to statsd
* Log ProtocolDescriptorList's protocol version field to statsd
* Log BluetoothProfileDescriptorList's profile version field to statsd
* Log SupportedFeatures for A2DP, HFP, AVRCP, PBAP, MAP to statsd
* Log SDP metrics before we disconnect from L2CAP during SDP discovery
* Values are logged in small endian array
* Do this logging before we declare an SDP search is done
Bug:
112969790
Test: make, test drive with statsd
Change-Id: Idd340e495ecb85abc27de2b2d71305ee5218b43c
Cheney Ni [Wed, 12 Dec 2018 12:20:28 +0000 (20:20 +0800)]
Add audio channel of Bluetooth Audio Hal v2 for Hearing Aid
This brings a new interface for Hearing Aid to communicate with audio.
Both audio control and data path go through the new Bluetooth audio
HAL and is similar to A2DP usecase. It initials this interface of client
side and get audio provider at setup and manage session with audio hal.
There is a system property to switch between the UIPC socket and the
Bluetooth Audio Hal v2 interface:
persist.bluetooth.bluetooth_audio_hal.enabled
Bug:
111519504
Bug:
120222104
Test: manual test with Hearing Aid
TODO: Pass audio matadata into Hearing Aid service
Change-Id: I648775d61a8a4fe4fa680dd31ffc39fc89267c06
Cheney Ni [Thu, 7 Feb 2019 00:14:14 +0000 (16:14 -0800)]
Merge "Add stack side interface for Bluetooth audio HAL V2" am:
9ac498e5f3
am:
03b104281d
Change-Id: I76c95b532437bb754685cd07ebe71d2f8285c583
Cheney Ni [Thu, 7 Feb 2019 00:10:11 +0000 (16:10 -0800)]
Merge "Add stack side interface for Bluetooth audio HAL V2"
am:
9ac498e5f3
Change-Id: Id1b7339721558e2772eca4ce9eebb57a51a04f9d
Treehugger Robot [Thu, 7 Feb 2019 00:00:28 +0000 (00:00 +0000)]
Merge "Add stack side interface for Bluetooth audio HAL V2"
Joseph Pirozzo [Wed, 6 Feb 2019 21:26:06 +0000 (13:26 -0800)]
Merge "PBAP Client SDP record" am:
02efe2113f
am:
aa513eab75
Change-Id: Ica014e4e2c09b033797f42e10477ab2d873da510
Joseph Pirozzo [Wed, 6 Feb 2019 21:21:54 +0000 (13:21 -0800)]
Merge "PBAP Client SDP record"
am:
02efe2113f
Change-Id: Ie681046a23a481471608df00d1367271a6be0229