OSDN Git Service
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
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"
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:54:36 +0000 (11:54 -0800)]
Merge "Audio HAL: Check if ProviderFactory is null before printing debugging" am:
32202930cd am:
c67269ce67
am:
1580efa93f
Change-Id: I7e0cc88800ca9ac23468b3819bb406d77b78c6c6
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
TreeHugger Robot [Thu, 28 Feb 2019 19:19:36 +0000 (19:19 +0000)]
Merge "Send empty string instead of nullptr for BLDN event"
Sal Savage [Thu, 28 Feb 2019 19:09:49 +0000 (19:09 +0000)]
Merge "Audio HAL: Check if ProviderFactory is null before printing debugging"
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
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
(cherry picked from commit
8fa2dbb0e0a264168d45ea101fa29962ff24bfa4)
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
Annie Meng [Wed, 27 Feb 2019 19:29:25 +0000 (19:29 +0000)]
Merge "Revert "BluetoothAudio HAL: flip to be enabled by default""
Hansong Zhang [Wed, 27 Feb 2019 18:59:34 +0000 (18:59 +0000)]
Revert "Start the media encoder for a successful BTA_AV_START_EVT"
This reverts commit
836ab37ed63a68da7cd247789e759e9067b34de6.
Reason for revert: Broke test
Change-Id: I7b02c0b0261daa9c5b116ba865c909394789bb78
Hansong Zhang [Wed, 27 Feb 2019 18:59:34 +0000 (18:59 +0000)]
Revert "BluetoothAudio HAL: flip to be enabled by default"
This reverts commit
0666b679da93248ede2f3cd644f86b380583b80d.
Reason for revert: Broke test
Change-Id: Ie0bf6fac751f4568f1e42b3159eeb82939b49b2c
Vic Huang [Wed, 27 Feb 2019 10:31:18 +0000 (18:31 +0800)]
Send empty string instead of nullptr for BLDN event
Send nullptr for BLDN event cause null pointer dereference
in isValidUtf(). Replace it to empty string.
Bug:
126300780
Test: Manual test redial pass
Change-Id: I834e1c4d01eb2a0aa7b35a57259e050313367263
Cheney Ni [Tue, 26 Feb 2019 03:56:25 +0000 (11:56 +0800)]
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: Ib857ea8b74384c6e82ac19ee6128b83f6b16d6fe
Cheney Ni [Sat, 23 Feb 2019 18:14:20 +0000 (02:14 +0800)]
BluetoothAudio HAL: flip to be enabled by default
Bug:
126304229
Test: Switch BluetoothAudio HAL and A2DP offload manully
Change-Id: I26dc39fd5d483590f7cc9ae9bd5972f90719f93a
Martin Brabham [Wed, 27 Feb 2019 01:02:42 +0000 (01:02 +0000)]
Merge "btif/osi: move I/O to OSI layer. disable for multi-user."
Hansong Zhang [Wed, 27 Feb 2019 00:35:20 +0000 (16:35 -0800)]
Reactor-based alarm implementation am:
1499636274 am:
e9a215cee5
am:
642bed55a9
Change-Id: I933d2b56d2d1c248fe22007505e31b27bd73cc0b
Hansong Zhang [Wed, 27 Feb 2019 00:34:55 +0000 (16:34 -0800)]
Reactor-based threading model am:
7972cd5401 am:
53453ce4b6
am:
049a0a0c99
Change-Id: Ib7de0adca444470e43b1a8a91b0ea419e8ffccc0
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
Martin Brabham [Mon, 25 Feb 2019 22:40:33 +0000 (14:40 -0800)]
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: b/
125452367
Test: atest net_test_btif net_test_bluetooth net_test_osi
Change-Id: I7af452e00a4f342f1c49006e86488b59195b70ce
Xin Li [Tue, 26 Feb 2019 04:54:36 +0000 (20:54 -0800)]
[automerger skipped] Merge "DO NOT MERGE - Merge pi-dev@
5234907 into stage-aosp-master" into stage-aosp-master am:
b97284078a -s ours
am:
e2d223e756 -s ours
am skip reason: subject contains skip directive
Change-Id: Ia15f70a5bd939d062118e5c3dc85f0df41d40c36
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 01:20:23 +0000 (17:20 -0800)]
[automerger skipped] DO NOT MERGE - Merge pi-dev@
5234907 into stage-aosp-master am:
00f9d294b1 -s ours
am:
a715eacf26 -s ours
am skip reason: subject contains skip directive
Change-Id: I3b92bdd518ee6261cd2546031d5e944638a88c56
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 23:27:57 +0000 (15:27 -0800)]
Merge "clang: Set to 120 characters per line" am:
b228330d0e am:
a0cd616877
am:
8ba4ce1737
Change-Id: Ib0faa73830ef4f75f70d088560d24e07c3814239
Cheney Ni [Mon, 25 Feb 2019 23:19:37 +0000 (15:19 -0800)]
Don't require A2DP codec information when initialize audio_hal_interface am:
8552e95c46 am:
5024f3c93c
am:
ba13d4b53b
Change-Id: I780d1a51c40b4d24aad43db10d202e0f57616cab
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:42:23 +0000 (23:42 -0800)]
Merge "Fix mtu assignment with correct value" into pi-dev am:
2a1ee659ea
am:
31df9d3a8e
Change-Id: Idf850c0785160bba745ed11d98686bf0028c0c4c
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:22:02 +0000 (21:22 -0800)]
[automerger skipped] Merge "Do not close dump file descriptor" into pi-dev am:
fdd0bb033f -s ours
am:
767a41c70a -s ours
am skip reason: change_id Id351b5429cb17b48e37313850a363d739d78c4a1 with SHA1
e8ab460e35 is in history
Change-Id: I4d95b217b4dda8c6628b8115e1390f84a0ab78bf
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 [Fri, 22 Feb 2019 00:06:36 +0000 (16:06 -0800)]
Merge "Fix for Bluetooth device name is resetting to default name after reboot" into pi-dev am:
80c748c407
am:
8bef6b3159
Change-Id: I6d2296960d1d0d53a17b018876b814e43047263a
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 22:30:28 +0000 (14:30 -0800)]
Fix crash when more than 2 PHYs specified for connection am:
d20051b26a am:
8919facfd7
am:
54b80ce4b3
Change-Id: I019fd259af2495ebaf52a6b74b40442e1a725a49
Cheney Ni [Wed, 20 Feb 2019 22:15:27 +0000 (14:15 -0800)]
Merge changes I58ceea50,I73319018 am:
fcbe660320 am:
abfb80dacb
am:
f4b25f5b32
Change-Id: Ie3e2aa2f600b39683e577fea19019e4fcba3b61a
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 18:18:52 +0000 (10:18 -0800)]
[automerger skipped] DO NOT MERGE - Merge PPRL.190205.001 into master am:
b5d88246be -s ours am:
74e82c1777 -s ours
am:
ab5bc63a13 -s ours
am skip reason: subject contains skip directive
Change-Id: I4e93b5e16a6bd55d764c41790b5fa2107379da96
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
Martin Brabham [Tue, 12 Feb 2019 19:23:39 +0000 (11:23 -0800)]
Handle edge cases where input or hash/data could be null.
Bug: b/
124233545
Test: Manual; atest net_test_btif net_test_bluetooth
Change-Id: Ia91ea822ee2147b2a2d14bea250a708e8c10bae4
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:19:31 +0000 (19:19 -0800)]
Merge "Add support for a2dp offload HAL ver2.0" am:
10cad005f5 am:
f7fe77da3c
am:
ca68c93cbb
Change-Id: Icece435a8027c93381d8ea12699ff0168df4787a
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:30:50 +0000 (20:30 -0800)]
Merge "Rename a2dp_software_encoding to a2dp_encoding" am:
ad392e481f am:
8994b9c6d3
am:
171df63372
Change-Id: I0fc927029968857fb5121303997cc39b701268c6
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:48:44 +0000 (11:48 -0800)]
Remove unnecessary unlock am:
9ddb2adeb6 am:
8e25ada513
am:
230327f723
Change-Id: Ic6b9044220a96a48720f9359aada9f02a68fe708
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 [Fri, 15 Feb 2019 05:12:34 +0000 (21:12 -0800)]
[automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master am:
bd61251896 -s ours
am:
ae4b17d67f -s ours
am skip reason: subject contains skip directive
Change-Id: Ie8f177e7566ac00cd0c38853d447d70f9e3a5a7b
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
TreeHugger Robot [Thu, 14 Feb 2019 03:18:35 +0000 (03:18 +0000)]
Merge "Fix OOB in process_service_attr_rsp"
TreeHugger Robot [Thu, 14 Feb 2019 03:03:49 +0000 (03:03 +0000)]
Merge "Fix OOB in bnep_is_packet_allowed"
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
TreeHugger Robot [Wed, 13 Feb 2019 21:45:25 +0000 (21:45 +0000)]
Merge "Change the default snoop log level to off."
Joseph Pirozzo [Wed, 13 Feb 2019 20:38:58 +0000 (12:38 -0800)]
Merge "Flush buffer to filesystem before fsync" am:
2cc25459dd am:
61f1e9c870
am:
f9c444507c
Change-Id: I2079e8687d86a6a828bfbee28e340264d7a1f884
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
Chienyuan [Tue, 12 Feb 2019 08:01:00 +0000 (16:01 +0800)]
Fix OOB in bnep_is_packet_allowed
Bug:
112050983
Test: PoC
Change-Id: I5d331f46cdba86c8e61de206a2ede1d2b348d7e4
Ajay Panicker [Tue, 12 Feb 2019 02:04:21 +0000 (18:04 -0800)]
Change the default snoop log level to off.
Bug:
112970672
Test: Flash a userdebug build and see that there are no logs.
Change-Id: Iba2c5b7572a6750c06f86c31cfc6054e9595b8ce
Jack He [Sat, 9 Feb 2019 09:47:57 +0000 (01:47 -0800)]
Merge "Metrics: Log manfuacturer information from Device ID profile to statsd" am:
3894d1f0e6 am:
7c220d5a61
am:
ef8eab6f51
Change-Id: I039ab32670129a70f6aed5fb77ee59843f36f50b
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"
OSDN Git Service
