OSDN Git Service
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
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: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: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 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: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
Yi Kong [Fri, 1 Mar 2019 00:30:53 +0000 (00:30 +0000)]
Merge "Fix a bunch of incorrect syntax statements"
Yi Kong [Fri, 1 Mar 2019 00:05:09 +0000 (16:05 -0800)]
Fix a bunch of incorrect syntax statements
Found by the upcoming compiler update.
Test: m checkbuild
Change-Id: Ieafcddde7c91de990aaf7bf42de58039ba5555cd
Sal Savage [Thu, 28 Feb 2019 19:41:38 +0000 (11:41 -0800)]
Merge "Audio HAL: Check if ProviderFactory is null before printing debugging" am:
32202930cd
am:
c67269ce67
Change-Id: I58025c4525ed4b741f2b7b9ce02c775c50f75eea
Sal Savage [Thu, 28 Feb 2019 19:33:24 +0000 (11:33 -0800)]
Merge "Audio HAL: Check if ProviderFactory is null before printing debugging"
am:
32202930cd
Change-Id: I047574f44d3194f23774c3c75839657674174217
Sal Savage [Thu, 28 Feb 2019 19:09:49 +0000 (19:09 +0000)]
Merge "Audio HAL: Check if ProviderFactory is null before printing debugging"
Sal Savage [Wed, 27 Feb 2019 20:23:07 +0000 (12:23 -0800)]
Audio HAL: Check if ProviderFactory is null before printing debugging
Test: Build and flash on auto hardware to make sure the error went away
Change-Id: I90a8f3a0e0cbc23e7e4a2edcead46402f44ef3a4
Hansong Zhang [Wed, 27 Feb 2019 00:06:01 +0000 (16:06 -0800)]
Reactor-based alarm implementation am:
1499636274
am:
e9a215cee5
Change-Id: Ia5afa574b5a1ae4291fd8881f68c2e45ce247d05
Hansong Zhang [Wed, 27 Feb 2019 00:05:43 +0000 (16:05 -0800)]
Reactor-based threading model am:
7972cd5401
am:
53453ce4b6
Change-Id: I4574360ef759713e35a4085793227bfdb98e93b4
Hansong Zhang [Tue, 26 Feb 2019 23:53:42 +0000 (15:53 -0800)]
Reactor-based alarm implementation
am:
1499636274
Change-Id: I412be63f28f9f4d26b7d7bd9a58c831d597ea0f1
Hansong Zhang [Tue, 26 Feb 2019 23:53:24 +0000 (15:53 -0800)]
Reactor-based threading model
am:
7972cd5401
Change-Id: Ibf74ba5506089a6b7b2326e44db963238113f247
Xin Li [Tue, 26 Feb 2019 03:58:00 +0000 (19:58 -0800)]
[automerger skipped] Merge "DO NOT MERGE - Merge pi-dev@
5234907 into stage-aosp-master" into stage-aosp-master
am:
b97284078a -s ours
am skip reason: subject contains skip directive
Change-Id: I4bd6025a21607da5b2ccd79c8948497f48186649
Hansong Zhang [Wed, 12 Dec 2018 22:52:00 +0000 (14:52 -0800)]
Reactor-based alarm implementation
* Use Reactor+Thread (common/thread.h) to replace existing
libchrome-based message_loop_thread
* Use Alarm/RepeatingAlarm to replace existing Timer, by using
kernel-based timerfd, to make all components unified
Bug:
110303473
Test: run unit test, and run benchmark
Change-Id: I6d6bc8dc3897649d0f6cc00ce0aa7054a3ddc09d
Hansong Zhang [Wed, 12 Dec 2018 22:52:00 +0000 (14:52 -0800)]
Reactor-based threading model
* Use Reactor+Thread (common/thread.h) to replace existing
libchrome-based message_loop_thread
* Use Handler to implement multiple message queue per thread, by using
kernel-based eventfd
Test: run unit test, and run benchmark
Change-Id: Idd2e4ef99fb9a7b2c0956de0e372c67a1098f1b6
Xin Li [Tue, 26 Feb 2019 00:19:46 +0000 (16:19 -0800)]
[automerger skipped] DO NOT MERGE - Merge pi-dev@
5234907 into stage-aosp-master
am:
00f9d294b1 -s ours
am skip reason: subject contains skip directive
Change-Id: I5dc1cb04bd75ea5c465ff1671c0ea0372f42ed4b
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
Xin Li [Sat, 23 Feb 2019 00:39:20 +0000 (00:39 +0000)]
Merge "DO NOT MERGE - Merge pi-dev@
5234907 into stage-aosp-master" into stage-aosp-master
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
Xin Li [Thu, 21 Feb 2019 19:27:44 +0000 (11:27 -0800)]
DO NOT MERGE - Merge pi-dev@
5234907 into stage-aosp-master
Bug:
120848293
Change-Id: I1ef532e784869beb11b0487c266063f903523e95
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