OSDN Git Service
Jakub Pawlowski [Mon, 18 Jun 2018 22:26:28 +0000 (15:26 -0700)]
Fix SMP_Encrypt for data shorter than 16 bytes am:
db83273e52
am:
5576c09222
Change-Id: I757767c03e2d90342ad85bdb3f27f585a866eb7e
Jakub Pawlowski [Mon, 18 Jun 2018 22:23:24 +0000 (15:23 -0700)]
Fix SMP_Encrypt for data shorter than 16 bytes
am:
db83273e52
Change-Id: I75db1b7271a843578d4be45646769878665af45d
Jakub Pawlowski [Mon, 18 Jun 2018 20:29:24 +0000 (13:29 -0700)]
Fix SMP_Encrypt for data shorter than 16 bytes
This bug was introduced in commit
c3e7c878fe8495590f059547153bd77cdea322a6
osi_calloc was replaced with raw array, that is not wiped clean.
Change-Id: I57a4e7a26108ad4672d2dd2ff25028653c96ca1b
Jakub Pawlowski [Mon, 18 Jun 2018 19:49:49 +0000 (12:49 -0700)]
Merge "SMP_Encrypt - convert p_out into raw array" am:
9fef176790
am:
e2da90e74f
Change-Id: I91b87e7c7d2a0ac15bf2692b4c24a3609f694296
Jakub Pawlowski [Mon, 18 Jun 2018 19:36:53 +0000 (12:36 -0700)]
Merge "SMP_Encrypt - convert p_out into raw array"
am:
9fef176790
Change-Id: Ie7d6b7a6dbb5cf770be1217b9e70aca8d4c45fbb
Treehugger Robot [Mon, 18 Jun 2018 19:24:25 +0000 (19:24 +0000)]
Merge "SMP_Encrypt - convert p_out into raw array"
cheneyni [Sat, 16 Jun 2018 08:12:42 +0000 (01:12 -0700)]
[automerger skipped] Clear local suspending flag when the BTA_AV_STOP_EVT event received
am:
796062b73f -s ours
Change-Id: I225c4e5753be6ef27b5e0446244da806d440d536
Greg Kaiser [Sat, 16 Jun 2018 06:16:08 +0000 (23:16 -0700)]
gatt: Avoid using erased iterator am:
b6cf0e0c47
am:
db41e73344
Change-Id: Ic336a814bd442560c7d5c53b6e7adf70c2858598
Greg Kaiser [Sat, 16 Jun 2018 05:47:28 +0000 (22:47 -0700)]
gatt: Avoid using erased iterator
am:
b6cf0e0c47
Change-Id: I2a6daafd9ecec3f056c965081b55d16d2ed62543
Greg Kaiser [Fri, 15 Jun 2018 21:30:50 +0000 (14:30 -0700)]
gatt: Avoid using erased iterator
After we've called erase() on an iterator, we can't safely use
it anymore. We avoid this, to assure consistent behavior from
this code.
Test: None
Change-Id: I4c9aecadc768d57f942669b7e68ee3a302e67e9c
Joseph Pirozzo [Fri, 15 Jun 2018 21:01:46 +0000 (14:01 -0700)]
Merge "Add support for AVRCP addressed player changed." am:
60f9ad0fce
am:
f3b101feb9
Change-Id: I552aa7da3b69de4a81b5b7a4eab2bc68b8a697c1
Joseph Pirozzo [Fri, 15 Jun 2018 20:11:39 +0000 (13:11 -0700)]
Merge "Add support for AVRCP addressed player changed."
am:
60f9ad0fce
Change-Id: I7275200caeb8274b05ac486bde3e845f720e2310
Jakub Pawlowski [Thu, 14 Jun 2018 23:46:29 +0000 (16:46 -0700)]
SMP_Encrypt - convert p_out into raw array
SMP_Encrypt output is really 128bit value. No need for status or any
other additional fields.
Test: net_test_stack_smp.AesCmacTest covers that
Change-Id: Iabfaa85d6f4bd5715e0bdab9d3eaf22bb5c39239
Joseph Pirozzo [Fri, 15 Jun 2018 18:54:57 +0000 (18:54 +0000)]
Merge "Add support for AVRCP addressed player changed."
cheneyni [Mon, 11 Jun 2018 13:19:26 +0000 (21:19 +0800)]
Clear local suspending flag when the BTA_AV_STOP_EVT event received
The Stack would set the pending flag when received the Stop request but
did not clear it even state became Opened. This would cuase Stack
replied Suspended immediately to Audio HAL but kept peer at Started
state and failed to handle Start request again.
This change clears the local suspending flag when BTA_AV_STOP_EVT
received and also reset all pending status when becomes Opened so it
will take effect only when Stack is changing state from Started.
Bug:
110022304
Test: Manual: (1) Play A2DP music and switch codec
(2) Play A2DP music and change active device
Change-Id: I4b9aca33eb7eb6c40038e2082d23eb22e5830714
Merged-In: I4b9aca33eb7eb6c40038e2082d23eb22e5830714
(cherry picked from commit
e643d30249256461fd1c0a132b48c65e2eac18ba)
Jack He [Fri, 15 Jun 2018 17:54:44 +0000 (10:54 -0700)]
Merge "A2DP Offload: Log audio duration and codec metrics" am:
04f519cc02
am:
55ed4487bd
Change-Id: I2aa23ec9a4926c319f9b68731b79d375781391b9
Jack He [Fri, 15 Jun 2018 17:50:39 +0000 (10:50 -0700)]
Merge "A2DP Offload: Log audio duration and codec metrics"
am:
04f519cc02
Change-Id: I4189cc8720668a793db7c0dd56b35d7d51db92f6
Treehugger Robot [Fri, 15 Jun 2018 17:40:32 +0000 (17:40 +0000)]
Merge "A2DP Offload: Log audio duration and codec metrics"
cheneyni [Fri, 15 Jun 2018 08:48:04 +0000 (01:48 -0700)]
Clear local suspending flag when the BTA_AV_STOP_EVT event received am:
e643d30249
am:
223ed5a695
Change-Id: If23b35c5587772f36c78dc2330fd36d21104c15a
cheneyni [Fri, 15 Jun 2018 08:44:08 +0000 (01:44 -0700)]
Clear local suspending flag when the BTA_AV_STOP_EVT event received
am:
e643d30249
Change-Id: Ic373f590620291ec6e6afe4944768fd5a51b8baa
cheneyni [Mon, 11 Jun 2018 13:19:26 +0000 (21:19 +0800)]
Clear local suspending flag when the BTA_AV_STOP_EVT event received
The Stack would set the pending flag when received the Stop request but
did not clear it even state became Opened. This would cuase Stack
replied Suspended immediately to Audio HAL but kept peer at Started
state and failed to handle Start request again.
This change clears the local suspending flag when BTA_AV_STOP_EVT
received and also reset all pending status when becomes Opened so it
will take effect only when Stack is changing state from Started.
Bug:
110022304
Test: Manual: (1) Play A2DP music and switch codec
(2) Play A2DP music and change active device
Change-Id: I4b9aca33eb7eb6c40038e2082d23eb22e5830714
Jinguang Dong [Fri, 15 Jun 2018 06:34:26 +0000 (23:34 -0700)]
Merge "Fix the reconnect issue in hfp client" am:
e0628146cb
am:
f9d9064043
Change-Id: Ia8d2a0e7ac32836722a49f454c80e0314fb28e1f
Jinguang Dong [Fri, 15 Jun 2018 06:30:23 +0000 (23:30 -0700)]
Merge "Fix the reconnect issue in hfp client"
am:
e0628146cb
Change-Id: Ib687fb0b11cef8e1bbd3abc30a76ed21c1574e64
Treehugger Robot [Fri, 15 Jun 2018 06:22:30 +0000 (06:22 +0000)]
Merge "Fix the reconnect issue in hfp client"
Pavlin Radoslavov [Fri, 15 Jun 2018 02:05:14 +0000 (19:05 -0700)]
Merge "Correctly initialize A2DP Sink codecs if A2DP Source HW offload is enabled" am:
a69b5ecfea
am:
dbf9fb39b3
Change-Id: I156a200e5d40f2bf046076fb2b7c53fd5315d45d
Pavlin Radoslavov [Fri, 15 Jun 2018 02:00:51 +0000 (19:00 -0700)]
Merge "Correctly initialize A2DP Sink codecs if A2DP Source HW offload is enabled"
am:
a69b5ecfea
Change-Id: I46796070c29b454f35c9e24b8a5cc76b57d70eee
Jack He [Fri, 15 Jun 2018 01:04:12 +0000 (18:04 -0700)]
A2DP Offload: Log audio duration and codec metrics
* Add A2dpOffloadAudioStats class to store metrics for A2DP offload
* Add logging statements to log A2DP start/suspend/stop events when A2DP
offload is enabled
* Separate software encoding logging from hardware encoding logging
Bug:
109953464
Test: make, run A2DP in offload mode and dump metrics
Change-Id: I1a19c64c6b1ee530e5927dd3d13e31b00729850b
Treehugger Robot [Fri, 15 Jun 2018 01:39:43 +0000 (01:39 +0000)]
Merge "Correctly initialize A2DP Sink codecs if A2DP Source HW offload is enabled"
Stanley Tng [Fri, 15 Jun 2018 00:52:22 +0000 (17:52 -0700)]
Hearing Aid: codec and connection interval switching am:
518410ab59
am:
2104f6fec4
Change-Id: If0bf3d2db5e8f9b7dbb5aa6b9b2b826c5bf64989
Stanley Tng [Fri, 15 Jun 2018 00:48:47 +0000 (17:48 -0700)]
Hearing Aid: codec and connection interval switching
am:
518410ab59
Change-Id: I3a2fa96f4883032d9394ed13f007abe6473bd014
Stanley Tng [Sat, 9 Jun 2018 00:09:00 +0000 (17:09 -0700)]
Hearing Aid: codec and connection interval switching
Added support to switch the LE Connection Interval between 10 msec and
20 msec. Uses the "persist.bluetooth.hearingaid.interval" to configure.
Test: Manually use hearing aid devices and switches between 10 msec and
20 msec connection interval
Bug:
79579786
Change-Id: Iec15a0c9f76afe265368fd90662ffe60a29fb27b
Pavlin Radoslavov [Thu, 14 Jun 2018 23:27:54 +0000 (16:27 -0700)]
Correctly initialize A2DP Sink codecs if A2DP Source HW offload is enabled
This also fixes unit test failures if A2DP Source HW offload is enabled.
Bug:
110228602
Test: Failing unit tests now succeed
Change-Id: I36678738bfcfcce0f2e8a055f10c86cc6b3e682a
Jack He [Thu, 14 Jun 2018 23:27:41 +0000 (16:27 -0700)]
Merge "Multi-A2DP: Fix timing and codec measurement in metrics" am:
5006f15bf0
am:
0d42faaf81
Change-Id: I308692737c575178f6463e7fe3fe65636ea5dbe3
Jakub Pawlowski [Thu, 14 Jun 2018 23:27:15 +0000 (16:27 -0700)]
SMP_Encrypt refactor am:
c3e7c878fe
am:
aa3f9c7786
Change-Id: I0172651bb0cabaf0bc07ae45564795a87bd4e7a2
Jack He [Thu, 14 Jun 2018 23:19:20 +0000 (16:19 -0700)]
Merge "Multi-A2DP: Fix timing and codec measurement in metrics"
am:
5006f15bf0
Change-Id: Ie32387f1ba3b393fc11dc6c0729bc7983e595bd4
Jakub Pawlowski [Thu, 14 Jun 2018 23:17:04 +0000 (16:17 -0700)]
SMP_Encrypt refactor
am:
c3e7c878fe
Change-Id: I759c0d685f498c7bf4831c4b2a43e61934c7bca1
Treehugger Robot [Thu, 14 Jun 2018 23:10:13 +0000 (23:10 +0000)]
Merge "Multi-A2DP: Fix timing and codec measurement in metrics"
Jack He [Sat, 9 Jun 2018 03:13:23 +0000 (20:13 -0700)]
Multi-A2DP: Fix timing and codec measurement in metrics
* Copy BtifMediaStats and SchedulingStats when updating metrics
to avoid race conditions
* Do not log audio_duration_ms if session_end_us <= session_start_us
* Clear cached A2DP metrics when LogBluetoothSessionEnd() is called
* Log codec information along-side A2DP metrics
* Log whether A2DP offload is enabled along-side A2DP metrics
Multi-A2DP:
* Log LogBluetoothSessionStart at btif_a2dp_source_start_session_delayed
* Log LogBluetoothSessionEnd at btif_a2dp_source_end_session_delayed
Unit Test:
* Wrote A2DPSessionTwoUpdatesSeparatedbyEndTest that will fail if A2DP
metrics are not cleared when LogBluetoothSessionEnd is called
Bug:
109953464
Test: make, net_test_osi::BluetoothMetricsLoggerTest,
net_test_osi::BluetoothA2DPSessionMetricsTest
Change-Id: I6a311dce8035ce2e3f39773c260ea9eaef73e45b
Jakub Pawlowski [Thu, 14 Jun 2018 20:41:05 +0000 (13:41 -0700)]
Add tests for AES_CMAC am:
4d64a6e457
am:
994b476d63
Change-Id: Ic0fe76fc0a14f240e30cabd6a0ad63d100749383
Jakub Pawlowski [Thu, 14 Jun 2018 20:30:55 +0000 (13:30 -0700)]
Add tests for AES_CMAC
am:
4d64a6e457
Change-Id: I75c85096950fad7b7f2f9236690030858f64d874
Jakub Pawlowski [Thu, 14 Jun 2018 16:03:47 +0000 (09:03 -0700)]
SMP_Encrypt refactor
* key must be 16bit, so no need to pass it's length, and check it's
value
* p_out being null is a bad call that should crash to be catched, not an
error we should handle
* hash computation always succeed, don't return any errors
Test: existing unit tests cover it, i.e. AesCmacTest
Change-Id: Ifba8902f3f1a7be3c54dd7a33d9ff1e52ffd237b
Jakub Pawlowski [Thu, 14 Jun 2018 07:20:13 +0000 (00:20 -0700)]
Add tests for AES_CMAC
Test: added AesCmacTest
Change-Id: I66615e581ee64debc2c25ae03e18decd2f8c8fa8
Jakub Pawlowski [Thu, 14 Jun 2018 00:15:02 +0000 (17:15 -0700)]
GATTC_Discover: pass parameters directly instead of through pointer am:
36b5cfd8a8
am:
80a62293e8
Change-Id: Ide24eca8eec6139a5fc883ea75ec246431dff4d3
Jakub Pawlowski [Wed, 13 Jun 2018 23:48:41 +0000 (16:48 -0700)]
GATTC_Discover: pass parameters directly instead of through pointer
am:
36b5cfd8a8
Change-Id: Icd3f7a6de58956864abb15528ae982794af534ce
Jakub Pawlowski [Fri, 8 Jun 2018 16:32:57 +0000 (09:32 -0700)]
GATTC_Discover: pass parameters directly instead of through pointer
Bug:
67057055
Test: manual
Change-Id: I7be853241595b336e2d4b67bc57170ee01ce6e72
Jakub Pawlowski [Wed, 13 Jun 2018 17:28:46 +0000 (10:28 -0700)]
GATT database refactor am:
3ee08accd4
am:
72240c4597
Change-Id: I6ab5006b1be40e93462ca3e96eae4e89ea9ce539
Jakub Pawlowski [Wed, 13 Jun 2018 17:24:30 +0000 (10:24 -0700)]
GATT database refactor
am:
3ee08accd4
Change-Id: Ie674bc6597457b33a0acc159c727e25f3c7dcd7a
Jakub Pawlowski [Wed, 18 Apr 2018 14:31:30 +0000 (07:31 -0700)]
GATT database refactor
Move logic and data responsible for GATT Discovery into separate class.
Create clean representation of GATT database, and attributes for
storage.
Minor service discovery improvements:
* don't send requests to explore services with start handle equal to end handle.
* don't try to discover characteristic if only one handle is left at end
of service - it uses two handles, one for definition, one for value
* if secondary service is defined before service that includes it, it
should now be properly discovered.
Test: Added DatabaseBuilderTest, manual tests with LE HID devices, Daydream
Controller and Clips camera.
Bug:
67057055
Change-Id: I511f4ee7c56c8fa65f012de0b6d1291321840d11
Jacky Cheung [Wed, 13 Jun 2018 00:29:47 +0000 (17:29 -0700)]
Add storage API to get number of bonded devices am:
6fd3d4dfff
am:
0e7cb07048
Change-Id: Ia2bc588ad81f18ed7ee4f74c36832df7ef7c9269
Jacky Cheung [Wed, 13 Jun 2018 00:11:27 +0000 (17:11 -0700)]
Add storage API to get number of bonded devices
am:
6fd3d4dfff
Change-Id: I854927fea8b83c6e28398487140d2d1b1fc948dd
Jacky Cheung [Thu, 29 Jun 2017 22:27:35 +0000 (15:27 -0700)]
Add storage API to get number of bonded devices
Test: manual
Change-Id: Iaded8031bf706d84cff68f78dff8feb887a159a4
Jinguang Dong [Tue, 12 Jun 2018 11:56:24 +0000 (19:56 +0800)]
Fix the reconnect issue in hfp client
The HFP client would not reconnect any more on collision scenario
as upper layer calls the connect API per 30s. which related with
CL of
5eccd90936d606e0070872b247fd3462e9c9c19b
Bug:
74518379
Test: Manual test for multiple incoming/outgoing HF connections
between Android Wear and Handset
Signed-off-by: Kai Huang <huangkai1@huawei.com>
Change-Id: I445f3633165d8ec12f91bc5fe5a8217505318cff
Jakub Pawlowski [Mon, 11 Jun 2018 23:29:46 +0000 (16:29 -0700)]
Merge "Hearing Aid - codec switching" am:
40bd4c78d8
am:
ce0f4eac12
Change-Id: Ife334864df91646daacc6d215b1d6c584f00b9a8
Jakub Pawlowski [Mon, 11 Jun 2018 21:19:04 +0000 (14:19 -0700)]
Merge "Hearing Aid - codec switching"
am:
40bd4c78d8
Change-Id: I48a13888b78ca76813c4ef1d68779456fe3ef278
Treehugger Robot [Mon, 11 Jun 2018 20:06:20 +0000 (20:06 +0000)]
Merge "Hearing Aid - codec switching"
Jakub Pawlowski [Tue, 10 Apr 2018 07:16:53 +0000 (00:16 -0700)]
Hearing Aid - codec switching
StartSendingAudio internally sets the codec to the HearingAidAudioSource.
OnDeviceAvailable callback triggers audio framework to grab codec
configuration from HearingAidAudioSource. Those calls must be made in proper
order, otherwise audio framework will grab bad codec configuration.
This patch also remove default codec configuration, and crash if codec
configuration is not done correctly.
Test: use hearing aid supporting 24kHz codec
Change-Id: I9419d58fa8728fc8e0f0c2d2ed8d8d741309a9a3
Hansong Zhang [Mon, 11 Jun 2018 09:35:33 +0000 (02:35 -0700)]
Merge "Add documentation for enabling PTS mode" am:
ee8143b563
am:
fd239ca34d
Change-Id: I3aac9187c9df73297c1c64df4b2d1fa69c5e7f30
Ryo Hashimoto [Mon, 11 Jun 2018 09:31:18 +0000 (02:31 -0700)]
Merge "Use ParcelFileDescriptor implementation in libbinder" am:
07dc1fb8ad
am:
4f5e59991c
Change-Id: Ie18bec42207c01d614630e380c5183182608feac
Hansong Zhang [Mon, 11 Jun 2018 09:23:08 +0000 (02:23 -0700)]
Merge "Add documentation for enabling PTS mode"
am:
ee8143b563
Change-Id: I47c1103f56fd0544ad3848d2c6fc38091045d7f5
Ryo Hashimoto [Mon, 11 Jun 2018 08:21:49 +0000 (01:21 -0700)]
Merge "Use ParcelFileDescriptor implementation in libbinder"
am:
07dc1fb8ad
Change-Id: I9462f62bc97248674ba1cd7bb50adaddb447ff4c
Treehugger Robot [Mon, 11 Jun 2018 07:42:18 +0000 (07:42 +0000)]
Merge "Add documentation for enabling PTS mode"
Treehugger Robot [Mon, 11 Jun 2018 07:27:41 +0000 (07:27 +0000)]
Merge "Use ParcelFileDescriptor implementation in libbinder"
Xin Li [Sat, 9 Jun 2018 10:55:33 +0000 (03:55 -0700)]
Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
am:
4b4820b35a
Change-Id: I69072727ce20045d9841ca5bb7918fb0c7353102
Xin Li [Fri, 8 Jun 2018 18:09:17 +0000 (11:09 -0700)]
Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
Bug:
79597307
Change-Id: Iaccda26437bbee0e9fdbb8ce9af9df8d30946fc2
Pavlin Radoslavov [Fri, 8 Jun 2018 06:05:32 +0000 (23:05 -0700)]
[automerger skipped] Merge "Send ACK for A2DP_CTRL_CMD_SUSPEND even if audio was no streaming" am:
e0d333ce68
am:
2e71a11d60 -s ours
Change-Id: I1f16be65c429afffa645e730a354150957e062f7
Pavlin Radoslavov [Fri, 8 Jun 2018 06:00:16 +0000 (23:00 -0700)]
Merge "Send ACK for A2DP_CTRL_CMD_SUSPEND even if audio was no streaming"
am:
e0d333ce68
Change-Id: I15dfba2421d7f47f5cb2a0b100d6f3bd72f741ef
Treehugger Robot [Fri, 8 Jun 2018 05:39:40 +0000 (05:39 +0000)]
Merge "Send ACK for A2DP_CTRL_CMD_SUSPEND even if audio was no streaming"
Ajay Panicker [Fri, 8 Jun 2018 05:04:51 +0000 (22:04 -0700)]
Run the AVRCP Service interface functions on the BTA thread am:
e2301ee0bf
am:
23cb1b69ba
Change-Id: Ie4e2639c46756caef6012b032059b91ddbbc6254
Ajay Panicker [Fri, 8 Jun 2018 05:04:40 +0000 (22:04 -0700)]
[automerger skipped] AVRCP: Narrow the scope of the lock in Init and Cleanup am:
505a45bb88
am:
04670fe8b1 -s ours
Change-Id: I1253f967d09b24638384caed9b8af7b3bed70336
Ajay Panicker [Fri, 8 Jun 2018 05:04:30 +0000 (22:04 -0700)]
[automerger skipped] AVRCP: Cancel all pending messages and prevent future messages after cleanup am:
b5e41e6b81
am:
aacf6bea51 -s ours
Change-Id: Ia1b936c68e1dcf6b247f8a5df3866ab762bf9ff2
Ajay Panicker [Thu, 7 Jun 2018 23:39:40 +0000 (16:39 -0700)]
Run the AVRCP Service interface functions on the BTA thread
am:
e2301ee0bf
Change-Id: Ic20603680325d1ac8a04e0c19d0391bd074b047e
Ajay Panicker [Thu, 7 Jun 2018 23:39:33 +0000 (16:39 -0700)]
AVRCP: Narrow the scope of the lock in Init and Cleanup
am:
505a45bb88
Change-Id: Ie80fddbbc5b8a67d9bef26b9e957f971d7a41c76
Ajay Panicker [Thu, 7 Jun 2018 23:39:25 +0000 (16:39 -0700)]
AVRCP: Cancel all pending messages and prevent future messages after cleanup
am:
b5e41e6b81
Change-Id: I73f572c346e78d47796db12c405d523683693b89
Ajay Panicker [Thu, 31 May 2018 00:50:39 +0000 (17:50 -0700)]
Run the AVRCP Service interface functions on the BTA thread
Bug:
80416347
Test: Turn off Bluetooth while connected to a device we initiated the
connection to.
Change-Id: I8f10409c495213ef3117aedf66919de7c0b3d164
(cherry picked from commit
95e1a9e65f2d61523753f19d8855144672413506)
Ajay Panicker [Thu, 24 May 2018 18:26:15 +0000 (11:26 -0700)]
AVRCP: Narrow the scope of the lock in Init and Cleanup
Bug:
80227904
Test: Disable Bluetooth while connected to a device
Change-Id: I6c77e38ebaa84e4a075ef4636d6b519d4ccfb8c5
(cherry picked from commit
4369f6f7607c17ef0ab77bb52d23f20dbc54e424)
Ajay Panicker [Tue, 22 May 2018 21:42:16 +0000 (14:42 -0700)]
AVRCP: Cancel all pending messages and prevent future messages after cleanup
Bug:
79859133
Test: Regression test and repeatedly turn Bluetooth off and on
Change-Id: I1aa05cc5430dbda1d4bae6aa9543f655baed77b4
(cherry picked from commit
85624a8015128ec0bb846e539030d11b85952323)
Ajay Panicker [Thu, 7 Jun 2018 15:13:58 +0000 (08:13 -0700)]
Merge "Don't reuse buffer when building response" into pi-dev
am:
fc56cb1c02
Change-Id: I584666d4714a28f901bdde3543423edc4a4336a4
TreeHugger Robot [Thu, 7 Jun 2018 15:08:47 +0000 (15:08 +0000)]
Merge "Don't reuse buffer when building response" into pi-dev
Pavlin Radoslavov [Tue, 5 Jun 2018 05:18:32 +0000 (22:18 -0700)]
Send ACK for A2DP_CTRL_CMD_SUSPEND even if audio was no streaming
The A2DP_CTRL_CMD_SUSPEND command from the Audio HAL could be received
even if audio wasn't streaming before. Therefore, we should always
respond with an ACK once the command processing has been completed.
Bug:
109712592
Test: Manual: (1) Play music to Headset; (2) Select "This device" as output;
(3) Stop playing music; (4) Select Headset as output
Change-Id: I0f5d52d14b50882931b9d19de1a2f25204fce19e
Merged-In: I0f5d52d14b50882931b9d19de1a2f25204fce19e
(cherry picked from commit
3008cfbeb15605adb0c925d394d9e9934f74d6f6)
Ajay Panicker [Thu, 7 Jun 2018 06:37:57 +0000 (23:37 -0700)]
Merge changes from topic "am-
662f3e36-36cc-485d-824b-
f28c01eea384" into oc-dev am:
0cda123801 am:
427aebe54a am:
20b2bc080e
am:
99428a2cf3
Change-Id: Ia69fc7c4c5eb4ab150efa6d86873a2fe14ba7611
Ajay Panicker [Thu, 7 Jun 2018 06:37:28 +0000 (23:37 -0700)]
Merge changes from topic "am-
7125a1ce-592b-4a1d-a4e0-
c6f472d5dc83" into oc-dev am:
086995d099 am:
352b01c987 am:
728f645ccc
am:
7025221957
Change-Id: I1d55229bd2d00bdae34de2b0e1caa46b99890b91
Ajay Panicker [Thu, 7 Jun 2018 06:36:55 +0000 (23:36 -0700)]
[automerger skipped] DO NOT MERGE: Don't reuse buffer when building response am:
9bbce86038 am:
2e3d8cde0e am:
34d0e93bc6 -s ours
am:
61557d3cda
Change-Id: I64f99bd361978ad902be073dba57d091bdc31002
Pavlin Radoslavov [Thu, 7 Jun 2018 06:36:32 +0000 (23:36 -0700)]
Merge "Send ACK for A2DP_CTRL_CMD_SUSPEND even if audio was no streaming" into pi-dev
am:
ee67c2102c
Change-Id: I2462a922e3161c7228c70dcb9381857273e11196
Ajay Panicker [Thu, 7 Jun 2018 05:28:11 +0000 (22:28 -0700)]
Merge changes from topic "am-
662f3e36-36cc-485d-824b-
f28c01eea384" into oc-dev am:
0cda123801 am:
427aebe54a
am:
20b2bc080e
Change-Id: I3662266f41058a194921afe9126dfbbd0b9c8b52
Ajay Panicker [Thu, 7 Jun 2018 05:26:17 +0000 (22:26 -0700)]
Merge changes from topic "am-
7125a1ce-592b-4a1d-a4e0-
c6f472d5dc83" into oc-dev am:
086995d099 am:
352b01c987
am:
728f645ccc
Change-Id: I1e3070df2626d5c92f0afe4654da67eb107fee85
Ajay Panicker [Thu, 7 Jun 2018 05:25:47 +0000 (22:25 -0700)]
[automerger skipped] DO NOT MERGE: Don't reuse buffer when building response am:
9bbce86038 am:
2e3d8cde0e
am:
34d0e93bc6 -s ours
Change-Id: I573567707397a1aa0cb69a683156c1a5b76b7bd0
TreeHugger Robot [Thu, 7 Jun 2018 05:25:08 +0000 (05:25 +0000)]
Merge "Send ACK for A2DP_CTRL_CMD_SUSPEND even if audio was no streaming" into pi-dev
Ajay Panicker [Thu, 7 Jun 2018 04:21:58 +0000 (21:21 -0700)]
Merge changes from topic "am-
662f3e36-36cc-485d-824b-
f28c01eea384" into oc-dev am:
0cda123801
am:
427aebe54a
Change-Id: I7d0fb74f7c6f45411f72c0471a239f933e3fc101
Ajay Panicker [Thu, 7 Jun 2018 04:21:32 +0000 (21:21 -0700)]
Merge changes from topic "am-
7125a1ce-592b-4a1d-a4e0-
c6f472d5dc83" into oc-dev am:
086995d099
am:
352b01c987
Change-Id: I1753fa0854933bf75a4d8c763d2be1d29fa398af
Ajay Panicker [Thu, 7 Jun 2018 04:20:59 +0000 (21:20 -0700)]
DO NOT MERGE: Don't reuse buffer when building response am:
9bbce86038
am:
2e3d8cde0e
Change-Id: I3a59bf8a5c375be0388952a1232316bf88ae0928
Ajay Panicker [Thu, 7 Jun 2018 03:08:39 +0000 (20:08 -0700)]
Merge changes from topic "am-
662f3e36-36cc-485d-824b-
f28c01eea384" into oc-dev
am:
0cda123801
Change-Id: I439feb0e5a5ee9dc65613aab59f48f98405ac1c5
Ajay Panicker [Thu, 7 Jun 2018 03:08:06 +0000 (20:08 -0700)]
Merge changes from topic "am-
7125a1ce-592b-4a1d-a4e0-
c6f472d5dc83" into oc-dev
am:
086995d099
Change-Id: I8ba858a9bfdc2d81c487692cda8bb16e9b371356
Ajay Panicker [Thu, 7 Jun 2018 03:07:30 +0000 (20:07 -0700)]
DO NOT MERGE: Don't reuse buffer when building response
am:
9bbce86038
Change-Id: I0b7edc528c15d05e2b07c2ad5b30c40a387eb87f
Jakub Pawlowski [Thu, 7 Jun 2018 01:56:10 +0000 (18:56 -0700)]
Revert "Don't start the authentication when peer device already started it" am:
5b8bc9874e
am:
6d76269721
Change-Id: I6fb125214acfad72639de42a852a5b4d43858fb9
TreeHugger Robot [Thu, 7 Jun 2018 01:53:54 +0000 (01:53 +0000)]
Merge changes from topic "am-
662f3e36-36cc-485d-824b-
f28c01eea384" into oc-dev
* changes:
[automerger] DO NOT MERGE: Don't reuse buffer when building response am:
ecef51ee8f am:
cf7d3de311 am:
3a9eca8d4c am:
2f532ef9b0 skipped:
052add83b4
[automerger] DO NOT MERGE: Don't reuse buffer when building response am:
ecef51ee8f am:
cf7d3de311 am:
3a9eca8d4c am:
2f532ef9b0
[automerger] DO NOT MERGE: Don't reuse buffer when building response am:
ecef51ee8f am:
cf7d3de311 am:
3a9eca8d4c
[automerger] DO NOT MERGE: Don't reuse buffer when building response am:
ecef51ee8f am:
cf7d3de311
[automerger] DO NOT MERGE: Don't reuse buffer when building response am:
ecef51ee8f
DO NOT MERGE: Don't reuse buffer when building response
TreeHugger Robot [Thu, 7 Jun 2018 01:36:28 +0000 (01:36 +0000)]
Merge changes from topic "am-
7125a1ce-592b-4a1d-a4e0-
c6f472d5dc83" into oc-dev
* changes:
[automerger] DO NOT MERGE: Don't reuse buffer when building response am:
5b27fef4d8 am:
4d07934351 am:
690cc6b25d skipped:
c4d802659d am:
f294bdbb98 am:
54ef7ee930 am:
ce6884eb30 am:
5d335dfb7b skipped:
66c6a114a6
[automerger] DO NOT MERGE: Don't reuse buffer when building response am:
5b27fef4d8 am:
4d07934351 am:
690cc6b25d skipped:
c4d802659d am:
f294bdbb98 am:
54ef7ee930 am:
ce6884eb30 am:
5d335dfb7b
[automerger] DO NOT MERGE: Don't reuse buffer when building response am:
5b27fef4d8 am:
4d07934351 am:
690cc6b25d skipped:
c4d802659d am:
f294bdbb98 am:
54ef7ee930 am:
ce6884eb30
[automerger] DO NOT MERGE: Don't reuse buffer when building response am:
5b27fef4d8 am:
4d07934351 am:
690cc6b25d skipped:
c4d802659d am:
f294bdbb98 am:
54ef7ee930
[automerger] DO NOT MERGE: Don't reuse buffer when building response am:
5b27fef4d8 am:
4d07934351 am:
690cc6b25d skipped:
c4d802659d am:
f294bdbb98
[automerger] DO NOT MERGE: Don't reuse buffer when building response am:
5b27fef4d8 am:
4d07934351 am:
690cc6b25d skipped:
c4d802659d
[automerger] DO NOT MERGE: Don't reuse buffer when building response am:
5b27fef4d8 am:
4d07934351 am:
690cc6b25d
[automerger] DO NOT MERGE: Don't reuse buffer when building response am:
5b27fef4d8 am:
4d07934351
[automerger] DO NOT MERGE: Don't reuse buffer when building response am:
5b27fef4d8
DO NOT MERGE: Don't reuse buffer when building response
Android Build Merger (Role) [Thu, 7 Jun 2018 00:46:48 +0000 (00:46 +0000)]
[automerger] DO NOT MERGE: Don't reuse buffer when building response am:
ecef51ee8f am:
cf7d3de311 am:
3a9eca8d4c am:
2f532ef9b0 skipped:
052add83b4
Change-Id: Id3ae5582793f9deabc23e530380f0aa565b64b8e
Android Build Merger (Role) [Thu, 7 Jun 2018 00:46:46 +0000 (00:46 +0000)]
[automerger] DO NOT MERGE: Don't reuse buffer when building response am:
ecef51ee8f am:
cf7d3de311 am:
3a9eca8d4c am:
2f532ef9b0
Change-Id: I39f72d38038768d9207455399184cccde2ccba4b
Android Build Merger (Role) [Thu, 7 Jun 2018 00:46:44 +0000 (00:46 +0000)]
[automerger] DO NOT MERGE: Don't reuse buffer when building response am:
ecef51ee8f am:
cf7d3de311 am:
3a9eca8d4c
Change-Id: Ib332da78669cd9e8b6c1d3f25d54cc8df23b444a
Android Build Merger (Role) [Thu, 7 Jun 2018 00:46:41 +0000 (00:46 +0000)]
[automerger] DO NOT MERGE: Don't reuse buffer when building response am:
ecef51ee8f am:
cf7d3de311
Change-Id: Idf12259570aae1cf15a4f4805df093a8d0dabf43
OSDN Git Service
