OSDN Git Service
Ajay Panicker [Thu, 5 Apr 2018 16:14:51 +0000 (09:14 -0700)]
Check if socket is closed before getting presentation position
Bug:
76456293
Test: Listen to music on a device that supports delay reporting
Change-Id: I4ca1c31819594750a7beb1d11ca5b8d64a7f836c
(cherry picked from commit
d4f2566ace5acf05d4f19143497c9bdfaf9dce67)
Hansong Zhang [Mon, 9 Apr 2018 22:12:28 +0000 (15:12 -0700)]
[automerger skipped] Merge "DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result" into oc-dev am:
781315d4af am:
b906b83069 -s ours
am:
3e71e5c2c3 -s ours
Change-Id: I060caa5b714842fd846ca6b9869fbb00cf7faa16
Hansong Zhang [Mon, 9 Apr 2018 22:07:33 +0000 (15:07 -0700)]
[automerger skipped] Merge "DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result" into oc-dev am:
781315d4af
am:
b906b83069 -s ours
Change-Id: I19d04178e5de67bacf4e955eaf8c69bf007ebf80
Hansong Zhang [Mon, 9 Apr 2018 22:02:05 +0000 (15:02 -0700)]
Merge "DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result" into oc-dev
am:
781315d4af
Change-Id: I08035c8474020faf9b8a4d31f0af06adf9be9297
TreeHugger Robot [Mon, 9 Apr 2018 21:51:37 +0000 (21:51 +0000)]
Merge "DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result" into oc-dev
Hansong Zhang [Mon, 9 Apr 2018 21:10:59 +0000 (14:10 -0700)]
Merge changes from topic "am-
3af7df0e-526d-4f8d-8ff1-
cc32970b6656" into oc-dev am:
b1a0889f76 am:
f82d65ad36
am:
1a5e3d8a8f
Change-Id: Idb0b1fa7a939318303861998635b6b622e94a414
Hansong Zhang [Mon, 9 Apr 2018 21:09:22 +0000 (14:09 -0700)]
Merge changes from topic "am-
67cc014c-1372-4bfa-8272-
45a792f72a05" into oc-dev am:
8216545fcb am:
5898801986
am:
1b2f4d8d92
Change-Id: Ia192caa1fad347a49da134730b4df7600a308c62
Hansong Zhang [Mon, 9 Apr 2018 20:55:34 +0000 (13:55 -0700)]
Merge changes from topic "am-
3af7df0e-526d-4f8d-8ff1-
cc32970b6656" into oc-dev am:
b1a0889f76
am:
f82d65ad36
Change-Id: Ibf5043d1ff63340bff3688b52c6e412c0a23c629
Hansong Zhang [Mon, 9 Apr 2018 20:54:10 +0000 (13:54 -0700)]
Merge changes from topic "am-
67cc014c-1372-4bfa-8272-
45a792f72a05" into oc-dev am:
8216545fcb
am:
5898801986
Change-Id: Ibf9e48bb42fb8794e5082a3569c278f514c0642f
Hansong Zhang [Mon, 9 Apr 2018 20:48:15 +0000 (13:48 -0700)]
Merge changes from topic "am-
3af7df0e-526d-4f8d-8ff1-
cc32970b6656" into oc-dev
am:
b1a0889f76
Change-Id: Icc21ee9eebce0056dc6885f23874aee889f2cede
Hansong Zhang [Mon, 9 Apr 2018 20:47:46 +0000 (13:47 -0700)]
Merge changes from topic "am-
67cc014c-1372-4bfa-8272-
45a792f72a05" into oc-dev
am:
8216545fcb
Change-Id: I3b4cb5886d4d5223d7c9a79ac59e8714189cf3f8
Hansong Zhang [Mon, 9 Apr 2018 20:47:31 +0000 (13:47 -0700)]
[automerger skipped] Merge "DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result" into oc-mr1-dev
am:
37726e1a42 -s ours
Change-Id: Iede70b74083a4f25ff9d0847c8164035d327ecea
TreeHugger Robot [Mon, 9 Apr 2018 20:41:56 +0000 (20:41 +0000)]
Merge changes from topic "am-
3af7df0e-526d-4f8d-8ff1-
cc32970b6656" into oc-dev
* changes:
[automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am:
4e583ae97b am:
e986af6874 am:
a37f3e68b9 skipped:
11fe847f5b am:
463584ae61 am:
0592daaae0 am:
ae857fb5d5 am:
05a0d17de2 skipped:
6a6eadc2e4
[automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am:
4e583ae97b am:
e986af6874 am:
a37f3e68b9 skipped:
11fe847f5b am:
463584ae61 am:
0592daaae0 am:
ae857fb5d5 am:
05a0d17de2
[automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am:
4e583ae97b am:
e986af6874 am:
a37f3e68b9 skipped:
11fe847f5b am:
463584ae61 am:
0592daaae0 am:
ae857fb5d5
[automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am:
4e583ae97b am:
e986af6874 am:
a37f3e68b9 skipped:
11fe847f5b am:
463584ae61 am:
0592daaae0
[automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am:
4e583ae97b am:
e986af6874 am:
a37f3e68b9 skipped:
11fe847f5b am:
463584ae61
[automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am:
4e583ae97b am:
e986af6874 am:
a37f3e68b9 skipped:
11fe847f5b
[automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am:
4e583ae97b am:
e986af6874 am:
a37f3e68b9
[automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am:
4e583ae97b am:
e986af6874
[automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am:
4e583ae97b
DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result
TreeHugger Robot [Mon, 9 Apr 2018 20:41:27 +0000 (20:41 +0000)]
Merge changes from topic "am-
67cc014c-1372-4bfa-8272-
45a792f72a05" into oc-dev
* changes:
[automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am:
f55b3093f1 am:
dbe2d9451f am:
11fb9e98f6 am:
de43e591ab skipped:
d37abe6045
[automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am:
f55b3093f1 am:
dbe2d9451f am:
11fb9e98f6 am:
de43e591ab
[automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am:
f55b3093f1 am:
dbe2d9451f am:
11fb9e98f6
[automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am:
f55b3093f1 am:
dbe2d9451f
[automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am:
f55b3093f1
DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result
TreeHugger Robot [Mon, 9 Apr 2018 20:40:54 +0000 (20:40 +0000)]
Merge "DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result" into oc-mr1-dev
TreeHugger Robot [Mon, 9 Apr 2018 19:14:13 +0000 (19:14 +0000)]
Merge "HFP: Report AT+BIA command to upper layer" into pi-dev
Hansong Zhang [Sat, 7 Apr 2018 00:02:20 +0000 (17:02 -0700)]
[automerger skipped] Merge "DO NOT MERGE Fix unexpected behavior in smp_sm_event" into oc-dev am:
9837db006d am:
4bdf63c191
am:
d5a3971d77 -s ours
Change-Id: I723b79271810dbff1f139a8e3c52fda26000c39c
Hansong Zhang [Fri, 6 Apr 2018 23:57:25 +0000 (16:57 -0700)]
Merge "DO NOT MERGE Fix unexpected behavior in smp_sm_event" into oc-dev am:
9837db006d
am:
4bdf63c191
Change-Id: I1cf0ee2f23638ead504ac56f8d5964c0a7ddf1e4
Hansong Zhang [Fri, 6 Apr 2018 23:52:54 +0000 (16:52 -0700)]
Merge "DO NOT MERGE Fix unexpected behavior in smp_sm_event" into oc-dev
am:
9837db006d
Change-Id: I838951d04e7dc02ae37ba01644d7e32006cc1285
TreeHugger Robot [Fri, 6 Apr 2018 23:41:24 +0000 (23:41 +0000)]
Merge "DO NOT MERGE Fix unexpected behavior in smp_sm_event" into oc-dev
Stanley Tng [Fri, 6 Apr 2018 22:52:29 +0000 (15:52 -0700)]
[automerger skipped] Merge changes from topic "nyc-dev-fix-l2cap-bad-pkt" into oc-dev am:
93b9a1a85c am:
616818d5c9
am:
f7a51d41c2 -s ours
Change-Id: I48e6c094229f7c99e700cbad0baaac13279b948f
Hansong Zhang [Fri, 6 Apr 2018 22:52:02 +0000 (15:52 -0700)]
Merge changes from topic "am-
052c6ecb-b5c1-4a10-9d60-
0251d0e6f8d6" into oc-dev am:
7d2623a4ad am:
3eaed2cf81
am:
8ba28ebdfd
Change-Id: I6ca14b43fc72b65e510ec448a57aac65cfb263dd
Stanley Tng [Fri, 6 Apr 2018 22:47:54 +0000 (15:47 -0700)]
Merge changes from topic "nyc-dev-fix-l2cap-bad-pkt" into oc-dev am:
93b9a1a85c
am:
616818d5c9
Change-Id: I1b79cbb693c3aaae016af04816dc7173348241de
Hansong Zhang [Fri, 6 Apr 2018 22:47:28 +0000 (15:47 -0700)]
Merge changes from topic "am-
052c6ecb-b5c1-4a10-9d60-
0251d0e6f8d6" into oc-dev am:
7d2623a4ad
am:
3eaed2cf81
Change-Id: Ida9bffe6ee50911ff20f1a41d431205b30b34cf1
Stanley Tng [Fri, 6 Apr 2018 22:45:33 +0000 (15:45 -0700)]
Merge changes from topic "nyc-dev-fix-l2cap-bad-pkt" into oc-dev
am:
93b9a1a85c
Change-Id: I603447db4f8bc1d411368fe41b257f29e3071ce9
Hansong Zhang [Fri, 6 Apr 2018 22:44:35 +0000 (15:44 -0700)]
Merge changes from topic "am-
052c6ecb-b5c1-4a10-9d60-
0251d0e6f8d6" into oc-dev
am:
7d2623a4ad
Change-Id: I7bab25cad1ad7d8d70db8dcf3c5c00fdb3638c67
TreeHugger Robot [Fri, 6 Apr 2018 22:41:24 +0000 (22:41 +0000)]
Merge changes from topic "nyc-dev-fix-l2cap-bad-pkt" into oc-dev
* changes:
[automerger] DO NOT MERGE Drop LE CoC fragments when frame size is too big am:
235eab9efd am:
e4bd77b256 am:
197f2a3893 am:
a29c667c1a skipped:
9e5aa5c98f
[automerger] DO NOT MERGE Drop LE CoC fragments when frame size is too big am:
235eab9efd am:
e4bd77b256 am:
197f2a3893 am:
a29c667c1a
[automerger] DO NOT MERGE Drop LE CoC fragments when frame size is too big am:
235eab9efd am:
e4bd77b256 am:
197f2a3893
[automerger] DO NOT MERGE Drop LE CoC fragments when frame size is too big am:
235eab9efd am:
e4bd77b256
[automerger] DO NOT MERGE Drop LE CoC fragments when frame size is too big am:
235eab9efd
DO NOT MERGE Drop LE CoC fragments when frame size is too big
TreeHugger Robot [Fri, 6 Apr 2018 22:41:21 +0000 (22:41 +0000)]
Merge "Fix unexpected behavior in smp_sm_event" into pi-dev
TreeHugger Robot [Fri, 6 Apr 2018 22:30:25 +0000 (22:30 +0000)]
Merge changes from topic "am-
052c6ecb-b5c1-4a10-9d60-
0251d0e6f8d6" into oc-dev
* changes:
[automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am:
61c9430c58 am:
058e2df213 am:
917f3d5e22 am:
bd4d802773 skipped:
78dcd6eee6
[automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am:
61c9430c58 am:
058e2df213 am:
917f3d5e22 am:
bd4d802773
[automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am:
61c9430c58 am:
058e2df213 am:
917f3d5e22
[automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am:
61c9430c58 am:
058e2df213
[automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am:
61c9430c58
DO NOT MERGE Fix unexpected behavior in smp_sm_event
Hansong Zhang [Fri, 6 Apr 2018 22:28:45 +0000 (15:28 -0700)]
[automerger skipped] [automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am:
040aa7be74 am:
d9af1fffcb am:
f5960e961c skipped:
37a3914a42 am:
8fd38dcd3c am:
d58ad85a12 am:
cd6784f464 am:
7fa0bf6106 skipped:
6f49839d7b am:
0aaeaf661c am:
5a8cb7a3d8
am:
f1dd1ee333 -s ours
Change-Id: Ib83be1761370e5b147212e652e723bdf00501cdb
TreeHugger Robot [Fri, 6 Apr 2018 22:23:39 +0000 (22:23 +0000)]
Merge "Add hidden API to get current user of HID Device (2/3)" into pi-dev
Hansong Zhang [Fri, 6 Apr 2018 22:23:27 +0000 (15:23 -0700)]
[automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am:
040aa7be74 am:
d9af1fffcb am:
f5960e961c skipped:
37a3914a42 am:
8fd38dcd3c am:
d58ad85a12 am:
cd6784f464 am:
7fa0bf6106 skipped:
6f49839d7b am:
0aaeaf661c
am:
5a8cb7a3d8
Change-Id: Idc2c79cf42aa59916996e4e1cfaefa1c029855d1
Hansong Zhang [Fri, 6 Apr 2018 22:18:48 +0000 (15:18 -0700)]
[automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am:
040aa7be74 am:
d9af1fffcb am:
f5960e961c skipped:
37a3914a42 am:
8fd38dcd3c am:
d58ad85a12 am:
cd6784f464 am:
7fa0bf6106 skipped:
6f49839d7b
am:
0aaeaf661c
Change-Id: Ibcc5d6fc270ecc52ab3c2bc1e161fbd528ae51a5
TreeHugger Robot [Fri, 6 Apr 2018 20:45:21 +0000 (20:45 +0000)]
Merge "Hearing Aid: change get/set active device (1/3)" into pi-dev
Hansong Zhang [Mon, 8 Jan 2018 23:05:21 +0000 (15:05 -0800)]
Add hidden API to get current user of HID Device (2/3)
Bug:
69136526
Test: test with apps using HID Device profile
Change-Id: I6c6df052fac508499c42fc7ab493010e327d6003
(cherry picked from commit
4b7ff48ffcda4afce30a3a8715c433df635ba3a3)
Jack He [Thu, 5 Apr 2018 22:39:27 +0000 (15:39 -0700)]
HFP: Report AT+BIA command to upper layer
* Report AT+BIA command, AG indicator activation command, to upper layer
so that upper layer can decide on whether or not to subscribe to these
indicators
Bug:
77655992
Test: make
Change-Id: Ic330d6784c5edf20683cbfedda3fa54525878ce8
(cherry picked from commit
1fa5d797d023576c0d102e2e611345d32daaac42)
TreeHugger Robot [Fri, 6 Apr 2018 19:49:36 +0000 (19:49 +0000)]
Merge "HID Device: remove "Cabled" flag when device is not used" into pi-dev
Hansong Zhang [Wed, 4 Apr 2018 01:17:43 +0000 (18:17 -0700)]
HID Device: remove "Cabled" flag when device is not used
Remove the "HidDeviceCabled" flag from the config when the remote device
is not currently being usec
Bug:
77549256
Test: manual
Change-Id: I2c88e972457608699c3f0344357828324a419b90
(cherry picked from commit
28eb477bdc6517ebf6743d184459513ad491f2f8)
Ajay Panicker [Wed, 4 Apr 2018 05:28:06 +0000 (22:28 -0700)]
Disable absolute volume if the remote device rejects registration
Instead of trying to re-register for a rejected volume changed
notification, disable absolute volume. This prevents spinning if a
remote device continuously rejects all attempts to register. A volume
level of -2 will be used to represent that the volume notification was
rejected.
Bug:
77238060
Test: Run host native test net_test_avrcp
Change-Id: I228524fb30348ca691d0792f0c7bcc4653d1fcef
(cherry picked from commit
341424a255007cf180eb7441c8d1ae256836feba)
TreeHugger Robot [Thu, 5 Apr 2018 19:15:20 +0000 (19:15 +0000)]
Merge "Handle bad packet length in gatts_process_read_req" into pi-dev
TreeHugger Robot [Thu, 5 Apr 2018 19:13:48 +0000 (19:13 +0000)]
Merge "Revert "Handle bad packet length in gatts_process_read_req"" into pi-dev
Stanley Tng [Thu, 5 Apr 2018 16:54:13 +0000 (09:54 -0700)]
Handle bad packet length in gatts_process_read_req
Added error check and handling code in gatts_process_read_req to
make sure that the packet length is correct.
Please note that there is another earlier CL that is reverted and this
is the updated one.
Bug:
73172115
Test: Run the test program, poc, that was attached in the bug report
Change-Id: Ia9b4e502fa8f8384bf9767e68f73b48a0915141b
Stanley Tng [Thu, 5 Apr 2018 16:40:45 +0000 (09:40 -0700)]
Revert "Handle bad packet length in gatts_process_read_req"
This reverts commit
b63f087fc79c3d1a66f73c3a34e8a73ebd65e82d.
There will be a newer fix uploaded later.
Bug:
73172115
Test: None
Android Build Merger (Role) [Thu, 5 Apr 2018 00:07:04 +0000 (00:07 +0000)]
[automerger] DO NOT MERGE Drop LE CoC fragments when frame size is too big am:
235eab9efd am:
e4bd77b256 am:
197f2a3893 am:
a29c667c1a skipped:
9e5aa5c98f
Change-Id: I3bdb8e4f5defef9034e4b3d86412b1ae738095e3
Android Build Merger (Role) [Thu, 5 Apr 2018 00:07:02 +0000 (00:07 +0000)]
[automerger] DO NOT MERGE Drop LE CoC fragments when frame size is too big am:
235eab9efd am:
e4bd77b256 am:
197f2a3893 am:
a29c667c1a
Change-Id: I02e4726181241715843b48e7d4f06b962b434438
Android Build Merger (Role) [Thu, 5 Apr 2018 00:07:01 +0000 (00:07 +0000)]
[automerger] DO NOT MERGE Drop LE CoC fragments when frame size is too big am:
235eab9efd am:
e4bd77b256 am:
197f2a3893
Change-Id: I098a1f34ba3e5dd419bb019b643e5ae22d8fbb63
Android Build Merger (Role) [Thu, 5 Apr 2018 00:06:59 +0000 (00:06 +0000)]
[automerger] DO NOT MERGE Drop LE CoC fragments when frame size is too big am:
235eab9efd am:
e4bd77b256
Change-Id: I0396a059146eab90983a49b846bc86c1905a8f20
Android Build Merger (Role) [Thu, 5 Apr 2018 00:06:57 +0000 (00:06 +0000)]
[automerger] DO NOT MERGE Drop LE CoC fragments when frame size is too big am:
235eab9efd
Change-Id: I0b963de5871e4bf4c8fb8115376e1badc9c06803
Stanley Tng [Wed, 4 Apr 2018 23:38:22 +0000 (16:38 -0700)]
DO NOT MERGE Drop LE CoC fragments when frame size is too big
Drop the LE CoC data fragments when the received fragment size is too
big.
Test: Runs LE CoC SL4A test, BleCocTest.
Bug:
75298652
Merged-In: I529944341e9e67a39e7ec7e740d5ada3db8cc23a
Change-Id: I529944341e9e67a39e7ec7e740d5ada3db8cc23a
Hansong Zhang [Wed, 28 Mar 2018 23:43:21 +0000 (16:43 -0700)]
Hearing Aid: change get/set active device (1/3)
* setActiveDevice() returns false in error case, e.g. when the device is
not connected
* add getActiveDevices() instead of isActiveDevice(), which returns a list
that must have two elements: left and right, or empty list on error
Test: manual
Bug:
69623109
Change-Id: I6f872dd88422e9d7e5187603d3ad33628726e1ca
(cherry picked from commit
8618b30c9907e89d06dee51b532667e40ece3a72)
Hansong Zhang [Mon, 2 Apr 2018 17:05:56 +0000 (10:05 -0700)]
DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result
Check the number of UUIDs from remote device
Bug:
74016921
Test: manual
Change-Id: Ia13f34578a046faf03506cfe10680dd5c93b1af6
Merged-In: I1ca1f66bfc935f5fd219e8147511bdac7d2789ef
Hansong Zhang [Mon, 2 Apr 2018 17:05:56 +0000 (10:05 -0700)]
DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result
Check the number of UUIDs from remote device
Bug:
74016921
Test: manual
Change-Id: I1ca1f66bfc935f5fd219e8147511bdac7d2789ef
Ajay Panicker [Tue, 3 Apr 2018 01:21:04 +0000 (18:21 -0700)]
Persist VFS ID's between directory changes.
Some carkits don't honor the fact that VFS ID's only are consistent to
the folder they are currently browsing. Now a UID will remain valid
until the connection ends.
Bug:
68812037
Test: Run net_test_avrcp
Change-Id: I67898277327b54eaeca2121b9ff173b22bd4ba71
(cherry picked from commit
fc136d12df62cfe68d8515c1c7bb23a68abc8d6e)
Ajay Panicker [Mon, 2 Apr 2018 22:36:35 +0000 (15:36 -0700)]
Refresh the now playing ID map when the now playing list changes
The Now Playing List ID's could be invalid if the now playing list
changes but there is not track change, like when adding a song to the
queue on the device.
Bug:
68812037
Test: Run host native test net_test_avrcp
Change-Id: I3c2c11aa87b64241f378819c38ae5cc21ffdb5ac
(cherry picked from commit
e016b53fa445e29dcc1d8594f5142f3a6f5358ef)
Ajay Panicker [Sat, 31 Mar 2018 21:38:53 +0000 (14:38 -0700)]
Add MTU Handling for AVRCP Packets
Bug:
77241554
Test: Run host native tests net_test_avrcp and net_test_btpacket
Change-Id: If32aa506dc8f99220ef35efeb4d77a1023767afe
(cherry picked from commit
e6552097abb756fcf92c24cc0cff4d7677fb0825)
Stanley Tng [Mon, 2 Apr 2018 16:08:22 +0000 (09:08 -0700)]
Handle bad packet length in gatts_process_read_req
Added error check and handling code in gatts_process_read_req to
make sure that the packet length is correct.
Bug:
73172115
Test: Run the test program, poc, that was attached in the bug report
Change-Id: I375853987010c87432e73b75d659eabee852ec9c
Android Build Merger (Role) [Mon, 2 Apr 2018 16:58:46 +0000 (16:58 +0000)]
[automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am:
4e583ae97b am:
e986af6874 am:
a37f3e68b9 skipped:
11fe847f5b am:
463584ae61 am:
0592daaae0 am:
ae857fb5d5 am:
05a0d17de2 skipped:
6a6eadc2e4
Change-Id: I41bc6f3077c08e0e5bafa0af9844d2ac0260ed59
Android Build Merger (Role) [Mon, 2 Apr 2018 16:58:44 +0000 (16:58 +0000)]
[automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am:
4e583ae97b am:
e986af6874 am:
a37f3e68b9 skipped:
11fe847f5b am:
463584ae61 am:
0592daaae0 am:
ae857fb5d5 am:
05a0d17de2
Change-Id: Icc2caeff1b265b54b06d40d7202d7be407b08e5c
Android Build Merger (Role) [Mon, 2 Apr 2018 16:58:43 +0000 (16:58 +0000)]
[automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am:
4e583ae97b am:
e986af6874 am:
a37f3e68b9 skipped:
11fe847f5b am:
463584ae61 am:
0592daaae0 am:
ae857fb5d5
Change-Id: I8b7d25413a505d9ef3989e3d36607a7c83ff99e6
Android Build Merger (Role) [Mon, 2 Apr 2018 16:58:41 +0000 (16:58 +0000)]
[automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am:
4e583ae97b am:
e986af6874 am:
a37f3e68b9 skipped:
11fe847f5b am:
463584ae61 am:
0592daaae0
Change-Id: I4ff82057f6e839a8941becb5566555fb1d8f78a5
Android Build Merger (Role) [Mon, 2 Apr 2018 16:58:35 +0000 (16:58 +0000)]
[automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am:
4e583ae97b am:
e986af6874 am:
a37f3e68b9 skipped:
11fe847f5b am:
463584ae61
Change-Id: I3f3d68bac43d0a4673a4b21b1801da79f7841b53
Android Build Merger (Role) [Mon, 2 Apr 2018 16:58:33 +0000 (16:58 +0000)]
[automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am:
4e583ae97b am:
e986af6874 am:
a37f3e68b9 skipped:
11fe847f5b
Change-Id: I30ae8f458e18a4b4fb2c8457dca65ce68307cf46
Android Build Merger (Role) [Mon, 2 Apr 2018 16:58:32 +0000 (16:58 +0000)]
[automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am:
4e583ae97b am:
e986af6874 am:
a37f3e68b9
Change-Id: I9d0d9847904b361d457bba6b0f7dba6db9e6e10a
Android Build Merger (Role) [Mon, 2 Apr 2018 16:58:30 +0000 (16:58 +0000)]
[automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am:
4e583ae97b am:
e986af6874
Change-Id: I4560a77109abd6772f9a7ef7808d073699e23dc5
Android Build Merger (Role) [Mon, 2 Apr 2018 16:58:28 +0000 (16:58 +0000)]
[automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am:
4e583ae97b
Change-Id: I45246189f80aedb86c70064d85006ac8f5ba00ac
Hansong Zhang [Mon, 2 Apr 2018 16:55:58 +0000 (09:55 -0700)]
DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result
Check the number of UUIDs from remote device
Bug:
74016921
Test: manual
Change-Id: I5d3a90bad63af5b22dd155f1d60869b8149d350c
Android Build Merger (Role) [Mon, 2 Apr 2018 16:51:26 +0000 (16:51 +0000)]
[automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am:
f55b3093f1 am:
dbe2d9451f am:
11fb9e98f6 am:
de43e591ab skipped:
d37abe6045
Change-Id: Ic2890b5dd52734710fe57b5da68129245c561852
Android Build Merger (Role) [Mon, 2 Apr 2018 16:51:24 +0000 (16:51 +0000)]
[automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am:
f55b3093f1 am:
dbe2d9451f am:
11fb9e98f6 am:
de43e591ab
Change-Id: I270e23aa9c7718360f06c6e4ee58026f9b1c3056
Android Build Merger (Role) [Mon, 2 Apr 2018 16:51:22 +0000 (16:51 +0000)]
[automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am:
f55b3093f1 am:
dbe2d9451f am:
11fb9e98f6
Change-Id: Ia8a05230155e3dc89ee2c87dad2a3d32d609c7df
Android Build Merger (Role) [Mon, 2 Apr 2018 16:51:20 +0000 (16:51 +0000)]
[automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am:
f55b3093f1 am:
dbe2d9451f
Change-Id: I8248ec75159250a70f991ee28a0889c75340f1aa
Android Build Merger (Role) [Mon, 2 Apr 2018 16:51:18 +0000 (16:51 +0000)]
[automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am:
f55b3093f1
Change-Id: Ib7a1956032b8c363aaa47d249e6ec784c6690412
Hansong Zhang [Mon, 2 Apr 2018 16:29:49 +0000 (09:29 -0700)]
DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result
Check the number of UUIDs from remote device
Bug:
74016921
Test: manual
Change-Id: I7e1fd420c96bdb4d8b1bb129eb85045f9e3da443
Pavlin Radoslavov [Fri, 30 Mar 2018 19:14:14 +0000 (12:14 -0700)]
Reduce the number of PCM data reads for aptX and aptX HD
For every periodic aptX / aptX HD data packet, use a single read
operation for all PCM data that needs to be encoded, instead of
using multiple reads of smaller blocks of data.
Bug:
70899260
Test: Manual: stream to aptX/aptX HD headset, change the sample rate
Change-Id: Ifcb8302589f24f5d7ab89c645c50d6905197fb7f
Merged-In: Ifcb8302589f24f5d7ab89c645c50d6905197fb7f
(cherry picked from commit
c27d80a09e762b19eec09810822a5b6f39720e2b)
Myles Watson [Wed, 21 Mar 2018 23:45:32 +0000 (16:45 -0700)]
PAN: Always allocate in bta_pan_data_buf_ind_cback
Change I63b857d031c55d3a0754e4101e330843eb422b2a caused a double
free. Move the free call to pan_data_buf_ind_cb().
Free the buffer before every return in pan_data_buf_ind_cb.
Bug:
74950468
Test: manual tethering test with DUT sharing its connection
Change-Id: If4526f3042699581e2cdde79a362eef0f83768eb
Merged-In: If4526f3042699581e2cdde79a362eef0f83768eb
TreeHugger Robot [Fri, 30 Mar 2018 23:58:44 +0000 (23:58 +0000)]
Merge "RFCOMM: Add more logging on failure cases" into pi-dev
Android Build Merger (Role) [Fri, 30 Mar 2018 23:57:32 +0000 (23:57 +0000)]
[automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am:
040aa7be74 am:
d9af1fffcb am:
f5960e961c skipped:
37a3914a42 am:
8fd38dcd3c am:
d58ad85a12 am:
cd6784f464 am:
7fa0bf6106 skipped:
6f49839d7b
Change-Id: I34bc2e4a1ffaddaa715d6ca93702bf71d041141a
Android Build Merger (Role) [Fri, 30 Mar 2018 23:57:30 +0000 (23:57 +0000)]
[automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am:
040aa7be74 am:
d9af1fffcb am:
f5960e961c skipped:
37a3914a42 am:
8fd38dcd3c am:
d58ad85a12 am:
cd6784f464 am:
7fa0bf6106
Change-Id: I1abe8e714705eb6c74608c2e608c7dc747b175f1
Android Build Merger (Role) [Fri, 30 Mar 2018 23:57:29 +0000 (23:57 +0000)]
[automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am:
040aa7be74 am:
d9af1fffcb am:
f5960e961c skipped:
37a3914a42 am:
8fd38dcd3c am:
d58ad85a12 am:
cd6784f464
Change-Id: Ia05aec96a9297845ed8f998f34507faf2eb562aa
Android Build Merger (Role) [Fri, 30 Mar 2018 23:57:27 +0000 (23:57 +0000)]
[automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am:
040aa7be74 am:
d9af1fffcb am:
f5960e961c skipped:
37a3914a42 am:
8fd38dcd3c am:
d58ad85a12
Change-Id: I2d9e1e774d5694163049a52119fbd67b1ac4b718
Android Build Merger (Role) [Fri, 30 Mar 2018 23:57:26 +0000 (23:57 +0000)]
[automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am:
040aa7be74 am:
d9af1fffcb am:
f5960e961c skipped:
37a3914a42 am:
8fd38dcd3c
Change-Id: Ic8a22969dc8b52582eea14f731c00cf0463bd024
Android Build Merger (Role) [Fri, 30 Mar 2018 23:57:25 +0000 (23:57 +0000)]
[automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am:
040aa7be74 am:
d9af1fffcb am:
f5960e961c skipped:
37a3914a42
Change-Id: I608a9e64ae1882c318a8bc8f2710990679b496a0
Android Build Merger (Role) [Fri, 30 Mar 2018 23:57:23 +0000 (23:57 +0000)]
[automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am:
040aa7be74 am:
d9af1fffcb am:
f5960e961c
Change-Id: Id9f1cb41fde0ced026415ecf20766edd5df593ca
Android Build Merger (Role) [Fri, 30 Mar 2018 23:57:22 +0000 (23:57 +0000)]
[automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am:
040aa7be74 am:
d9af1fffcb
Change-Id: Id73dfb4249a191a95a30edf5e43948c6fcafedb6
Android Build Merger (Role) [Fri, 30 Mar 2018 23:57:20 +0000 (23:57 +0000)]
[automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am:
040aa7be74
Change-Id: I7c3bc0a75233b759ae029dd7297ea8f77db59723
Hansong Zhang [Fri, 30 Mar 2018 23:55:49 +0000 (16:55 -0700)]
DO NOT MERGE Fix unexpected behavior in smp_sm_event
Bug:
74121126
Test: manual
Change-Id: Ie5dd841d6461ad057c4ab572007f38c5446aba53
Android Build Merger (Role) [Fri, 30 Mar 2018 23:56:20 +0000 (23:56 +0000)]
[automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am:
61c9430c58 am:
058e2df213 am:
917f3d5e22 am:
bd4d802773 skipped:
78dcd6eee6
Change-Id: I022d88a5ca99ce2e062fe7841f26fba5971f463b
Android Build Merger (Role) [Fri, 30 Mar 2018 23:56:18 +0000 (23:56 +0000)]
[automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am:
61c9430c58 am:
058e2df213 am:
917f3d5e22 am:
bd4d802773
Change-Id: Ice42267f2191bbf8e78f9b85863ea0bc850cc99f
Android Build Merger (Role) [Fri, 30 Mar 2018 23:56:17 +0000 (23:56 +0000)]
[automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am:
61c9430c58 am:
058e2df213 am:
917f3d5e22
Change-Id: I0277e517cae82234c8ae069c6dd63c5490ece5fe
Android Build Merger (Role) [Fri, 30 Mar 2018 23:56:15 +0000 (23:56 +0000)]
[automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am:
61c9430c58 am:
058e2df213
Change-Id: Idc62cb9586d417c7ec8fee25810d6ca93747265c
Android Build Merger (Role) [Fri, 30 Mar 2018 23:56:13 +0000 (23:56 +0000)]
[automerger] DO NOT MERGE Fix unexpected behavior in smp_sm_event am:
61c9430c58
Change-Id: I4bec7ca811e03099ce24a284ebd9fa580a18fa23
Hansong Zhang [Fri, 30 Mar 2018 23:55:49 +0000 (16:55 -0700)]
DO NOT MERGE Fix unexpected behavior in smp_sm_event
Bug:
74121126
Test: manual
Change-Id: Ie5dd841d6461ad057c4ab572007f38c5446aba53
Hansong Zhang [Fri, 30 Mar 2018 23:27:37 +0000 (16:27 -0700)]
DO NOT MERGE Fix unexpected behavior in smp_sm_event
Bug:
74121126
Test: manual
Change-Id: Ie5dd841d6461ad057c4ab572007f38c5446aba53
Hansong Zhang [Fri, 30 Mar 2018 23:27:37 +0000 (16:27 -0700)]
Fix unexpected behavior in smp_sm_event
Bug:
74121126
Test: manual
Change-Id: Ie5dd841d6461ad057c4ab572007f38c5446aba53
TreeHugger Robot [Fri, 30 Mar 2018 22:48:05 +0000 (22:48 +0000)]
Merge "AVRCP play status change updates" into pi-dev
TreeHugger Robot [Fri, 30 Mar 2018 22:37:51 +0000 (22:37 +0000)]
Merge "AVRCP register for addressed player changed" into pi-dev
Jack He [Wed, 28 Mar 2018 20:02:37 +0000 (13:02 -0700)]
RFCOMM: Add more logging on failure cases
* Log every instance of RFCOMM unexpected disconnection
* Log every time when RFCOMM channel (DLCI) is changed
* Refactor some RFCOMM code to be more readable and easier for logging
* Remove excessive logging in power manager
* Assign HSP default version more appropriate location
* Replace some usage of NULL with nullptr
Bug:
77224743
Test: make, no functional changes
Change-Id: I5e62dd6d338f7e92a8b8d39c1fe155b71396034c
(cherry picked from commit
4e01c6d5f2d03fb5c98567b573a9dd32d28a4106)
Joseph Pirozzo [Wed, 28 Mar 2018 22:27:31 +0000 (15:27 -0700)]
AVRCP play status change updates
Process play status updates when seeking forward and backward.
Bug:
67568875
Test: seek forward and backward on paired phone and observe updates.
Change-Id: Id280f0e877cfea0a0da7603ab6d7bcfaf667d482
(cherry picked from commit
201790818da5b2d5df9120e53be19bbe136b2b1a)
Joseph Pirozzo [Wed, 28 Mar 2018 16:20:48 +0000 (09:20 -0700)]
AVRCP register for addressed player changed
Register to be notified when the addressed media player changes so we
can update the AVRCP controller.
Bug:
72495854
Test: Change media player on phone, verify media source is updated.
Change-Id: I932a25b9861734ecc6e1fdcf40f02cdde1fd049a
(cherry picked from commit
32b23b1d8696b02dbc4b2f8bc93109f62a2bb98d)
TreeHugger Robot [Fri, 30 Mar 2018 17:54:37 +0000 (17:54 +0000)]
Merge "Drop LE CoC fragments when frame size is too big" into pi-dev
Stanley Tng [Thu, 29 Mar 2018 00:12:28 +0000 (17:12 -0700)]
Drop LE CoC fragments when frame size is too big
Drop the LE CoC data fragments when the received fragment size is too
big.
Test: Runs LE CoC SL4A test, BleCocTest.
Bug:
75298652
Change-Id: I529944341e9e67a39e7ec7e740d5ada3db8cc23a