OSDN Git Service
Pavlin Radoslavov [Fri, 4 Aug 2017 04:01:20 +0000 (04:01 +0000)]
Merge "Added another entry to the INTEROP_2MBPS_LINK_ONLY interoperability database" into oc-dr1-dev
am:
1dc69f4180
Change-Id: I17f6180ebfb596d74ec6c76b6ec3573c37a9ffdc
Pavlin Radoslavov [Fri, 4 Aug 2017 03:50:45 +0000 (03:50 +0000)]
Merge "Added another entry to the INTEROP_2MBPS_LINK_ONLY interoperability database" into oc-dr1-dev
Pavlin Radoslavov [Fri, 4 Aug 2017 00:34:07 +0000 (17:34 -0700)]
Added another entry to the INTEROP_2MBPS_LINK_ONLY interoperability database
Bug:
64357126
Test: Audio streaming to the affected carkit
Change-Id: I160eb3775c77fe400798f038d2aae7dd7825aacb
Pankaj Kanwar [Fri, 4 Aug 2017 00:00:43 +0000 (00:00 +0000)]
Merge "Revert "Allow collection of Bluetooth firmware dumps in bugreports (3/3)"" into oc-dr1-dev
am:
233a2b47b2
Change-Id: Iad6f3b180335b51fb24935aaa87243fc597f64ed
Pankaj Kanwar [Thu, 3 Aug 2017 23:52:09 +0000 (23:52 +0000)]
Merge "Revert "Allow collection of Bluetooth firmware dumps in bugreports (3/3)"" into oc-dr1-dev
Joseph Pirozzo [Thu, 3 Aug 2017 23:46:53 +0000 (23:46 +0000)]
Merge "AVRCP Controller request metadata on playback." into oc-mr1-dev
Pankaj Kanwar [Thu, 3 Aug 2017 20:41:44 +0000 (20:41 +0000)]
Revert "Allow collection of Bluetooth firmware dumps in bugreports (3/3)"
This reverts commit
0580dd639cb10fafb6953d8a724db030df5030db.
Change-Id: I37f9ba5a9ace655d1d12404926a158fb9a4001a7
Jakub Pawlowski [Tue, 1 Aug 2017 22:12:04 +0000 (15:12 -0700)]
Workaround for Traxxas
Bug:
64252588
Test: net_test_stack_ad_parser
Change-Id: I1471e9e5f0f36ec931f8d86c927abbc1137e2b94
Merged-In: I1471e9e5f0f36ec931f8d86c927abbc1137e2b94
Joseph Pirozzo [Tue, 1 Aug 2017 21:58:03 +0000 (14:58 -0700)]
AVRCP Controller request metadata on playback.
Track metadata is only provided when requested, and the current
implementation only requested it when there was a track change
notification. Add a request for metadata whenever there is an
update to indicate that the play status is playing.
Bug:
63998350
Test: Start playing media, make a phone call, end a phonecall observe
metadata is correct.
Change-Id: Iea5cdacfe95c1a98cdaf73836ee6359a923f481b
Merged-In: Iae6969ff230d91335b6af41955f07f1151d79de2
(cherry picked from commit
7e08d96dc3b58e4d796c901b92d35185da005548)
Pavlin Radoslavov [Thu, 3 Aug 2017 03:17:38 +0000 (03:17 +0000)]
Don't reuse AVDTP internal state for different purposes
am:
c64dc1d284
Change-Id: Ia42b343751f2fa48a0b8f601256828d3c15718b2
Pavlin Radoslavov [Thu, 3 Aug 2017 02:47:37 +0000 (02:47 +0000)]
Add A2DP_DumpCodecInfo() API
am:
81c2234305
Change-Id: I9775e3cf2ca822cb9b8386f8d4a63f65b20b5952
Pavlin Radoslavov [Wed, 2 Aug 2017 20:52:14 +0000 (13:52 -0700)]
Don't reuse AVDTP internal state for different purposes
A number of issues were exposed by carkits that proactively try
to discover the codecs supported by the Phone and explicitly select
the A2DP codec.
* Don't reuse p_scb->p_cap for storing the most recent fetched capability
and for storing the result configuration while reconfiguring the stream.
Instead, use p_scb->cfg for storing the result configuration.
* Don't try to reconfigure the audio stream before all peer's capabilities
have been retrieved.
* Don't reset p_scb->sep_info_idx after fetching all capabilities inside
bta_av_save_caps(), otherwise the stream reconfiguration logic is
confused. Apparently, p_scb->sep_info_idx is overused for both:
(a) Pointing where to store the next capability while fetching the
capabilities.
(b) Storing the selected the SEP after the codec selection is completed.
Resetting p_scb->sep_info_idx to 0 creates logical confusion when the
actual selected SEP index is 0.
* Add extra debug log messages
Test: Connecting to and streaming with various carkits
Bug:
64128712
Change-Id: I5f57e9069d5402bcbb17613470ac0d29c8e45069
Pavlin Radoslavov [Wed, 2 Aug 2017 20:43:44 +0000 (13:43 -0700)]
Add A2DP_DumpCodecInfo() API
The API can be used to display A2DP codec info when using |LOG_DEBUG|.
Test: Code compilation
Bug:
64128712
Change-Id: I04379b45f24adb7008365d38ccc8aa7f49ed4b73
Sunny Kapdi [Wed, 2 Aug 2017 19:51:38 +0000 (19:51 +0000)]
Merge "AE: Set secondary adv max skip to zero" into oc-dr1-dev
am:
427ea2398a
Change-Id: I15c91b251467c86bf804efc0b175f3a47ddbb515
TreeHugger Robot [Wed, 2 Aug 2017 19:27:48 +0000 (19:27 +0000)]
Merge "AE: Set secondary adv max skip to zero" into oc-dr1-dev
Sunny Kapdi [Tue, 13 Jun 2017 19:20:04 +0000 (12:20 -0700)]
AE: Set secondary adv max skip to zero
Setting secondary adv max skip to zero to guarantee
when the AUX Tx happens. This way the App can use the
primary advertising interval to dictate the AUX Tx
interval.
Bug:
62552121
Change-Id: Id66222e4f8a583c42acafb6532f81a817504e606
Joseph Pirozzo [Tue, 1 Aug 2017 14:36:59 +0000 (14:36 +0000)]
Merge "HFP Client connect Audio" into oc-mr1-dev
Satish Kodishala [Tue, 1 Aug 2017 08:04:51 +0000 (08:04 +0000)]
Merge "Use the correct AVDTP version-specific features" into oc-dr1-dev
am:
3568ed17b5
Change-Id: Ic3ab9e63708b984377a6d2af3e1b72303cf5de88
TreeHugger Robot [Tue, 1 Aug 2017 07:59:36 +0000 (07:59 +0000)]
Merge "Use the correct AVDTP version-specific features" into oc-dr1-dev
Subramanian Srinivasan [Tue, 1 Aug 2017 06:17:15 +0000 (06:17 +0000)]
Merge "Fix processing of Inquiry results data" into oc-dr1-dev
am:
60a5b95359
Change-Id: Ibf826cfcf8a63281fe4af999df09666f6963c09f
TreeHugger Robot [Tue, 1 Aug 2017 06:07:23 +0000 (06:07 +0000)]
Merge "Fix processing of Inquiry results data" into oc-dr1-dev
Satish Kodishala [Fri, 24 Feb 2017 09:39:01 +0000 (15:09 +0530)]
Use the correct AVDTP version-specific features
Failure:
A2DP is not reconnected after power cycling DUT BT.
Root cause:
AVDTP v1.3 feature request (AVDT_GetAllCapReq) sent by DUT
as remote supports the same, but this 1.3 feature is not
completely supported by DUT which leads to erroneous behavior.
Fix:
Use AVDT_GetAllCapReq request only when both host and remote
AVDTP version are 1.3 and above.
Test: 1.Pair to CarKit; 2.Connect to CarKit; 3.Do BT power cycle @ DUT
Bug:
35657623
Change-Id: I66c2d7d8fe8506b74282bcca93595e1cbf5c2565
(cherry picked from commit
9cd9ef4c3818d2c7949f52703b3c2ba0e0f43f2f)
Tyler Freeman [Tue, 1 Aug 2017 01:54:36 +0000 (01:54 +0000)]
DO NOT MERGE ANYWHERE Allow the Bluetooth MAC address to be updated asynchronously (3/3) am:
fead72d124 -s ours am:
672ca0faf5 -s ours am:
0e379aaef1 -s ours
am:
2008a94da6 -s ours
Change-Id: I2b87cd38e48df0f6c3e13057812f1407cfd3ce8a
Tyler Freeman [Tue, 1 Aug 2017 01:40:07 +0000 (01:40 +0000)]
DO NOT MERGE ANYWHERE Allow the Bluetooth MAC address to be updated asynchronously (3/3) am:
fead72d124 -s ours am:
672ca0faf5 -s ours
am:
0e379aaef1 -s ours
Change-Id: I7cf536bdf1ab3c56ca5e1357749ef1b939dd703a
Tyler Freeman [Tue, 1 Aug 2017 01:33:50 +0000 (01:33 +0000)]
DO NOT MERGE ANYWHERE Allow the Bluetooth MAC address to be updated asynchronously (3/3) am:
fead72d124 -s ours
am:
672ca0faf5 -s ours
Change-Id: Icf9b2a90b0adb3d9645bd6839ed9c244ba8c8c26
Tyler Freeman [Tue, 1 Aug 2017 01:24:13 +0000 (01:24 +0000)]
DO NOT MERGE ANYWHERE Allow the Bluetooth MAC address to be updated asynchronously (3/3)
am:
fead72d124 -s ours
Change-Id: I96daa5c94b8ac75e2e7faf00911274ba72dff51b
Tyler Freeman [Fri, 28 Jul 2017 01:21:18 +0000 (18:21 -0700)]
DO NOT MERGE ANYWHERE Allow the Bluetooth MAC address to be updated asynchronously (3/3)
There are intermittent issues where either the returned Bluetooth
MAC address to Java framework is uninitialized or this address update
arrives too late. This fix will do 2 things:
(1) Returns error when MAC address is unavailable in the native code.
(2) Updates the MAC address later by adding a new broadcast event.
Test: Check address for these cases: factory reset, system reboot, and
Bluetooth re-enable.
Bug:
36709382
(cherry picked from commit
7dc0525365025e17e289869288b1b7d5146306cc)
Merged-In: I7b1c526ee227897c003ac921078f317f96b92604
Change-Id: I9810484a136c69d487a4b415c9265913db6c5cce
Subramanian Srinivasan [Fri, 26 May 2017 00:05:11 +0000 (17:05 -0700)]
Fix processing of Inquiry results data
Process inquiry results data based on the data
length sent from the lower stack layers and not
by using HCI_EXT_INQ_RESPONSE_LEN.
Bug:
62589724
Change-Id: Iee4a2c8f0dfb459404b28ba21061f7ced9f8455c
(cherry picked from commit
9bd6250eba5e624c94c66f053f5603dca8e0e4f1)
Joseph Pirozzo [Thu, 29 Jun 2017 21:23:01 +0000 (14:23 -0700)]
HFP Client connect Audio
Listen for incomming SCO connections any time the Hands Free Profile is
connected to a phone. Additionally allow eSCO connections on devices
that only support the standard SBC audio codec.
Bug:
62086689
Test: pair and connect a phone via HFP then start a phonecall and
enable and disable audio routing through BT observe that the connection
is established everytime.
Change-Id: I11319a4a85f8c9d36114a6fc09da0f0b8da16672
(cherry picked from commit
50d4656483d3f70b532646f83a6ad317bfdf3af8)
Pavlin Radoslavov [Mon, 31 Jul 2017 18:04:49 +0000 (18:04 +0000)]
Fix the MAC address for INTEROP_2MBPS_LINK_ONLY entry
am:
3507060c58
Change-Id: I13dcb9e1d99fea5a5a9df6c29725f6b3dcd785b4
Pavlin Radoslavov [Mon, 31 Jul 2017 03:18:57 +0000 (20:18 -0700)]
Fix the MAC address for INTEROP_2MBPS_LINK_ONLY entry
Bug:
62394764
Test: Code compilation
Change-Id: I3e6d8bb8258d6cc56ce05d7f17dda445859f011a
(cherry picked from commit
b60955f9c72d8481a1a2d92d46d59e2fd31139c9)
Pavlin Radoslavov [Fri, 28 Jul 2017 22:09:20 +0000 (22:09 +0000)]
Add interoperability mechanism to restrict the AVDTP MTU for AAC codec
am:
7cff5f55bf
Change-Id: I0ff942bd1e2c5f27810fe379db900a257c70c05c
Pavlin Radoslavov [Fri, 28 Jul 2017 02:19:32 +0000 (19:19 -0700)]
Add interoperability mechanism to restrict the AVDTP MTU for AAC codec
Also, add an interoperability entry for devices that are known
to have AAC-related issues.
Test: A2DP streaming to Headsets
Bug:
63725151
Change-Id: Ic9b6640da44ebc28bfa63a19a87f0543d69bc576
(cherry picked from commit
b866da0bc1254103146912077bcb49128963dee7)
Matadeen Mishra [Thu, 27 Jul 2017 02:38:36 +0000 (02:38 +0000)]
Merge "Retry authentication in key-missing or pairing collision use case" into oc-dr1-dev
am:
0b95c58b0d
Change-Id: I9eb1d34f2393189d0b15545e3defa96f1f128124
TreeHugger Robot [Thu, 27 Jul 2017 02:30:27 +0000 (02:30 +0000)]
Merge "Retry authentication in key-missing or pairing collision use case" into oc-dr1-dev
Stanley Tng [Thu, 27 Jul 2017 02:14:34 +0000 (02:14 +0000)]
Merge "Remove unwanted space characters from dialing number" into oc-dr1-dev
am:
332808df52
Change-Id: Ifa5ac616315960b79de5c58fb656db86c7fee8fc
TreeHugger Robot [Thu, 27 Jul 2017 02:07:35 +0000 (02:07 +0000)]
Merge "Remove unwanted space characters from dialing number" into oc-dr1-dev
Matadeen Mishra [Fri, 17 Feb 2017 07:10:53 +0000 (12:40 +0530)]
Retry authentication in key-missing or pairing collision use case
Problem:
A2DP connection failing with connection timeout
Steps:
1. Pair and connect car kit from DUT
2. Disconnect the car kit from DUT
3 Unpair DUT from car kit menu and initiate pairing from car kit.
Pairing and A2DP connection should be successful.
Failure:
Paring and A2DP connections fail
Root Cause:
As the stack posting authentication failure to upper layers
when SOC gives key missing error code remote removed from
DUT paired list, but same time lower layers keep retrying
for missing key and leading to connection failure.
Fix:
Don't post authentication complete to upper layers when stack
re trying for security in key missing or transaction collision cases
Test: manual
Bug:
35448920
Change-Id: I970c8679bf27801fe46f8dd757d6435ed500f77f
(cherry picked from commit
35752e32fb5d859c012f6d06f2c22fa6b1f84174)
Pavlin Radoslavov [Wed, 26 Jul 2017 21:36:59 +0000 (21:36 +0000)]
Use a mutex to protect the consistency of the tBTA_PM_TIMER state
am:
dbe6451648
Change-Id: Ifec93d0c6e9eccf65741877ec91cabacee83e857
Pavlin Radoslavov [Wed, 26 Jul 2017 06:55:04 +0000 (23:55 -0700)]
Use a mutex to protect the consistency of the tBTA_PM_TIMER state
Bug:
63689331
Test: Code compilation
Change-Id: Id8ab78473e1f766d5a76b967024b7ff4af499667
(cherry picked from commit
f470def4e91301b7b161b88b0428476ecce4f324)
Stanley Tng [Tue, 25 Jul 2017 17:07:05 +0000 (10:07 -0700)]
Remove unwanted space characters from dialing number
Certain car kits might send an AT command with space characters in
the dialing number. This commit adds a workaround to trim these unwanted
space characters.
Bug:
6340999
Test: Manual test with a car kit but purposely added numbers with spaces.
Change-Id: I9c238bc625fff8503c45cbbfaeb8bdd15b8a7d9a
(cherry picked from commit
54a1461a29a8c71dd010d418ec1b23012bf32805)
Pavlin Radoslavov [Sat, 22 Jul 2017 03:10:57 +0000 (03:10 +0000)]
Merge "Revert "Always restrict the AVDTP MTU for SBC codec to MAX_2MBPS_AVDTP_MTU(663)"" into oc-dr1-dev
am:
b53fcadb1b
Change-Id: I65980cd193a1bcc7d998b2301f5bc5748fe08bd6
Pavlin Radoslavov [Sat, 22 Jul 2017 03:10:38 +0000 (03:10 +0000)]
Merge "DO NOT MERGE ANYWHERE: Revert "Revert "Fix the interoperability mechanism for 2Mbps-only links for audio""" into oc-dr1-dev
am:
5074c2f9bf -s ours
Change-Id: Ib7249e8b798158cb0079ec205c5cdb5e74b7aa22
TreeHugger Robot [Sat, 22 Jul 2017 01:35:23 +0000 (01:35 +0000)]
Merge "Revert "Always restrict the AVDTP MTU for SBC codec to MAX_2MBPS_AVDTP_MTU(663)"" into oc-dr1-dev
TreeHugger Robot [Sat, 22 Jul 2017 01:30:28 +0000 (01:30 +0000)]
Merge "DO NOT MERGE ANYWHERE: Revert "Revert "Fix the interoperability mechanism for 2Mbps-only links for audio""" into oc-dr1-dev
Andre Eisenbach [Sat, 22 Jul 2017 00:33:51 +0000 (17:33 -0700)]
resolve merge conflicts of
f4835d65e to oc-dr1-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Icfc01cdf5b6c14711186b5412c996f66d9611373
Pavlin Radoslavov [Fri, 21 Jul 2017 22:06:29 +0000 (22:06 +0000)]
DO NOT MERGE ANYWHERE: Revert "Revert "Fix the interoperability mechanism for 2Mbps-only links for audio""
This reverts commit
ff1c56c3675079b3905739abffc3a6035529a248.
The original issue in oc-mr1-dev has been resolved by:
https://googleplex-android-review.git.corp.google.com/#/c/
2576565/
Change-Id: I8bac8dca7939bac1865fe820e3c7b8252ce99478
Merged-In: Idaa25e18c0b017d8859aab723244fdc2613fc159
Andre Eisenbach [Wed, 19 Jul 2017 22:33:07 +0000 (15:33 -0700)]
Reduce error conditions which cause link key deletion on auth complete
This inverts previous conditions which attempt to limit what error
conditions cause link key deletion and instead of excluding error codes
it provides a shorter list of codes which actually DO cause link key
deletion.
As a result, temporary failures caused by page timeouts, random
disconnects etc. should no longer cause link key deletion by accident.
Fixes:
63507123
Test: manual
Change-Id: I8d51403b8d233a3c335313b8f257a562c3d01109
(cherry picked from commit
51fb9c0e0cfbda559bf6377c183928ae48a24629)
Pavlin Radoslavov [Fri, 21 Jul 2017 00:00:36 +0000 (17:00 -0700)]
Fix the interoperability mechanism for 2Mbps-only links for audio
Also, added two new entries to the INTEROP_2MBPS_LINK_ONLY
interoperability database.
Bug:
62394764
Test: Audio streaming to headset that supports 3Mbps
Change-Id: Idaa25e18c0b017d8859aab723244fdc2613fc159
Merged-In: Idaa25e18c0b017d8859aab723244fdc2613fc159
(cherry picked from commit
0dec1807c6770a2e5f8b673588922046ed272255)
Andrew Scull [Fri, 21 Jul 2017 09:57:09 +0000 (09:57 +0000)]
Revert "Fix the interoperability mechanism for 2Mbps-only links for audio"
This reverts commit
039f9a8f09ab25b4b16acfd9aca3733108d02b28.
Reason for revert: Failing build in oc-mr1-dev
Change-Id: I186c116d4b26cd4b92938066309a898b82ef90bc
Merged-In: Idaa25e18c0b017d8859aab723244fdc2613fc159
(cherry picked from commit
ff1c56c3675079b3905739abffc3a6035529a248)
Andrew Scull [Fri, 21 Jul 2017 12:31:14 +0000 (12:31 +0000)]
Revert "Fix the interoperability mechanism for 2Mbps-only links for audio"
am:
ff1c56c367 -s ours
Change-Id: Iae2f852da3db08cdf01d328e9c46396e72d7e03c
Andrew Scull [Fri, 21 Jul 2017 09:57:09 +0000 (09:57 +0000)]
Revert "Fix the interoperability mechanism for 2Mbps-only links for audio"
This reverts commit
039f9a8f09ab25b4b16acfd9aca3733108d02b28.
Reason for revert: Failing build in oc-mr1-dev
Change-Id: I186c116d4b26cd4b92938066309a898b82ef90bc
Merged-In: Idaa25e18c0b017d8859aab723244fdc2613fc159
Pavlin Radoslavov [Fri, 21 Jul 2017 07:35:26 +0000 (07:35 +0000)]
Fix the interoperability mechanism for 2Mbps-only links for audio
am:
039f9a8f09
Change-Id: I6dbd07fbc27ff04038c3fe5c4a99eb8f2fc8e6c3
Pavlin Radoslavov [Fri, 21 Jul 2017 00:51:07 +0000 (00:51 +0000)]
Revert "Always restrict the AVDTP MTU for SBC codec to MAX_2MBPS_AVDTP_MTU(663)"
This reverts commit
9eee3a772b3f23e5c33845422203f0dec07be234.
Not needed anymore - handled by the interoperability database.
Bug:
62394764
Bug:
34127145
Test: Audio streaming to headset that supports 3Mbps
Change-Id: I143c07c171e0fe9ef882c5e506545187f9e41498
(cherry picked from commit
a97b0381c8626320151c246cfd9a71dedcf635ff)
Pavlin Radoslavov [Fri, 21 Jul 2017 00:00:36 +0000 (17:00 -0700)]
Fix the interoperability mechanism for 2Mbps-only links for audio
Also, added two new entries to the INTEROP_2MBPS_LINK_ONLY
interoperability database.
Bug:
62394764
Test: Audio streaming to headset that supports 3Mbps
Change-Id: Idaa25e18c0b017d8859aab723244fdc2613fc159
Merged-In: Idaa25e18c0b017d8859aab723244fdc2613fc159
(cherry picked from commit
0dec1807c6770a2e5f8b673588922046ed272255)
Andre Eisenbach [Wed, 19 Jul 2017 22:25:51 +0000 (22:25 +0000)]
Merge "resolve merge conflicts of
985644c8c to oc-dr1-dev-plus-aosp" into oc-dr1-dev-plus-aosp
am:
1ca355d6ed
Change-Id: Idbce69ff4607232857c3c31dfd40b0845debd18c
jruthe [Wed, 19 Jul 2017 22:25:37 +0000 (22:25 +0000)]
Merge "test_vendor: Fragment tests" am:
7453a5d341 am:
b8b17af6b8 am:
d0e79aecb5
am:
afd2d51955
Change-Id: I1ad4959fcf41c8102c768f073f8ed2ba2bafcc27
TreeHugger Robot [Wed, 19 Jul 2017 22:19:44 +0000 (22:19 +0000)]
Merge "resolve merge conflicts of
985644c8c to oc-dr1-dev-plus-aosp" into oc-dr1-dev-plus-aosp
jruthe [Wed, 19 Jul 2017 22:15:47 +0000 (22:15 +0000)]
Merge "test_vendor: Fragment tests" am:
7453a5d341 am:
b8b17af6b8
am:
d0e79aecb5
Change-Id: I43c6ade0c6617c9eb97161733b57dd2a3e4069f8
jruthe [Wed, 19 Jul 2017 22:12:45 +0000 (22:12 +0000)]
Merge "test_vendor: Fragment tests" am:
7453a5d341
am:
b8b17af6b8
Change-Id: Ia5e227f0cda1d072ece75c72a81ede7a379b7ec7
jruthe [Wed, 19 Jul 2017 22:10:16 +0000 (22:10 +0000)]
Merge "test_vendor: Fragment tests"
am:
7453a5d341
Change-Id: If10528953ba17e74851d28c079e8ed321f869209
Treehugger Robot [Wed, 19 Jul 2017 22:01:48 +0000 (22:01 +0000)]
Merge "test_vendor: Fragment tests"
Myles Watson [Wed, 19 Jul 2017 21:50:15 +0000 (21:50 +0000)]
test_vendor: Move include to .cc file am:
8769e8e923 am:
8b95e6e958 am:
2e703ac4ad
am:
9c959368a3
Change-Id: I26eaff4a561dd728785b94850c24cb3a1bffa8e0
Myles Watson [Wed, 19 Jul 2017 21:47:14 +0000 (21:47 +0000)]
test_vendor: Move include to .cc file am:
8769e8e923 am:
8b95e6e958
am:
2e703ac4ad
Change-Id: I904149ec223350722c8a3af7f261d309f9ffd34f
Myles Watson [Wed, 19 Jul 2017 21:43:45 +0000 (21:43 +0000)]
test_vendor: Move include to .cc file am:
8769e8e923
am:
8b95e6e958
Change-Id: I7aab7a02f4f579a91d489dcbaf0491c85a8f5278
Myles Watson [Wed, 19 Jul 2017 21:40:44 +0000 (21:40 +0000)]
test_vendor: Move include to .cc file
am:
8769e8e923
Change-Id: Iebdef1bd24f4ae9710df389fef482afd035aced7
Myles Watson [Tue, 7 Mar 2017 13:02:01 +0000 (05:02 -0800)]
test_vendor: Move include to .cc file
Test: compile
Change-Id: Ib13830f92c305bcd9d7e688d0d4dba78499b1f5b
Andre Eisenbach [Wed, 19 Jul 2017 18:58:40 +0000 (11:58 -0700)]
resolve merge conflicts of
985644c8c to oc-dr1-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I11ab2a019d1ab2c202eb47f373bf532deb6814d1
jruthe [Wed, 19 Jul 2017 00:35:07 +0000 (00:35 +0000)]
Merge "test_vendor: Implement L2CAP packet fragmentation" am:
3dc90dd77e am:
967f9908d7 am:
525753fab5
am:
91ea3dbd7c
Change-Id: Id548a020d1260652e524875702a82208b32b008b
Andre Eisenbach [Wed, 19 Jul 2017 00:34:47 +0000 (00:34 +0000)]
Do not delete pairing on HCI connection timeout am:
f54d7e2719 am:
4cd563fbfb am:
ea2a3f34cf
am:
7723f88c7e
Change-Id: I8d34812115024b55ad227d751b336c1eef8e5634
jruthe [Wed, 19 Jul 2017 00:33:32 +0000 (00:33 +0000)]
Merge "test_vendor: Implement L2CAP packet fragmentation" am:
3dc90dd77e am:
967f9908d7
am:
525753fab5
Change-Id: I31f564becafacd43b2e24dbcb22940e5597658a6
jruthe [Wed, 19 Jul 2017 00:31:54 +0000 (00:31 +0000)]
Merge "test_vendor: Implement L2CAP packet fragmentation" am:
3dc90dd77e
am:
967f9908d7
Change-Id: If3c699aed92a4f331b663727238b6d0d0d68686d
jruthe [Wed, 19 Jul 2017 00:28:20 +0000 (00:28 +0000)]
Merge "test_vendor: Implement L2CAP packet fragmentation"
am:
3dc90dd77e
Change-Id: I99e34e131e5735a676c7e8dc1ea1d902544213d4
Treehugger Robot [Wed, 19 Jul 2017 00:19:25 +0000 (00:19 +0000)]
Merge "test_vendor: Implement L2CAP packet fragmentation"
Andre Eisenbach [Wed, 19 Jul 2017 00:05:52 +0000 (00:05 +0000)]
Do not delete pairing on HCI connection timeout am:
f54d7e2719 am:
4cd563fbfb
am:
ea2a3f34cf
Change-Id: I4b227271d2080154c8dd11ae221754030d69ec42
Andre Eisenbach [Wed, 19 Jul 2017 00:03:51 +0000 (00:03 +0000)]
Do not delete pairing on HCI connection timeout am:
f54d7e2719
am:
4cd563fbfb
Change-Id: I0a019bc45665eeb340b2b8496913881e7b25d594
Andre Eisenbach [Wed, 19 Jul 2017 00:01:59 +0000 (00:01 +0000)]
Do not delete pairing on HCI connection timeout
am:
f54d7e2719
Change-Id: I3d56d141385c5d04b919baa2c4360ed242c2bc0f
Andre Eisenbach [Tue, 18 Jul 2017 22:13:55 +0000 (15:13 -0700)]
Do not delete pairing on HCI connection timeout
Change-Id: I67121f3f6d34cd82e243af11ecd735684c4ca67d
(cherry picked from commit
f54d7e2719e36016f8dfa70757ae750909765776)
Fixes:
63796670
Test: manual
jruthe [Thu, 8 Jun 2017 22:33:32 +0000 (15:33 -0700)]
test_vendor: Implement L2CAP packet fragmentation
Added functions to fragment an L2CAP packet into SDUs of variable size.
Test: Passes all of the tests in test/l2cap_test.cc
Change-Id: Id39042c32594c2e9f54e98def432f8d1655a3b41
jruthe [Fri, 7 Jul 2017 22:31:45 +0000 (15:31 -0700)]
test_vendor: Fragment tests
Test: compiles
Change-Id: I55c121b5ca97801b37315126164aa01ef3db45d0
Andre Eisenbach [Tue, 18 Jul 2017 22:13:55 +0000 (15:13 -0700)]
Do not delete pairing on HCI connection timeout
Change-Id: I67121f3f6d34cd82e243af11ecd735684c4ca67d
Fixes:
63796670
Test: manual
Pavlin Radoslavov [Tue, 18 Jul 2017 19:37:03 +0000 (19:37 +0000)]
Merge "Merge "Add missing extension length check while parsing BNEP control packets" into mnc-dev am:
fdcad53f8e am:
fd94c15a5a am:
0cea290eee am:
97922c7401 am:
c0008b6c2f am:
42b29f1ce6 am:
5328c7a32d am:
33f4a8065e am:
471e964d69 am:
1c780fabd5 am:
f4e2ea3bc2" into oc-dr1-dev-plus-aosp
am:
7df42e5cd1
Change-Id: Ie666b4e25dc443721d38a4e832ba87a7b046f8e9
Pavlin Radoslavov [Tue, 18 Jul 2017 19:36:47 +0000 (19:36 +0000)]
Merge "Merge "Add missing extension length check while parsing BNEP control packets" into mnc-dev am:
fdcad53f8e am:
fd94c15a5a am:
0cea290eee am:
97922c7401 am:
c0008b6c2f am:
42b29f1ce6 am:
5328c7a32d am:
33f4a8065e am:
471e964d69 am:
1c780fabd5 am:
2ebd8f5769" into oc-dr1-dev-plus-aosp
am:
baf00c914e
Change-Id: Ib8a34f5006117005c9b809cb343edadb7434d73a
Pavlin Radoslavov [Tue, 18 Jul 2017 19:36:34 +0000 (19:36 +0000)]
Merge "Free p_pending_data from tBNEP_CONN to avoid potential memory leaks am:
8f18afd26c am:
ffa87779a1 am:
7eda996189 am:
ba12732aad -s ours am:
107bb0f68d -s ours am:
73df1dfa11 -s ours am:
3fe34fe3fb -s ours am:
6d3312cdf0 -s ours am:
515c909b33 -s ours am:
a7020eafc3 -s ours am:
af917e81bd -s ours" into oc-dr1-dev-plus-aosp
am:
3d41b15cf7 -s ours
Change-Id: I563d26ff531fd8d481a02075b3759849d68919d6
Pavlin Radoslavov [Tue, 18 Jul 2017 19:36:19 +0000 (19:36 +0000)]
Free p_pending_data from tBNEP_CONN to avoid potential memory leaks am:
8f18afd26c am:
ffa87779a1 am:
7eda996189 am:
ba12732aad -s ours am:
107bb0f68d -s ours am:
73df1dfa11 -s ours am:
3fe34fe3fb -s ours am:
6d3312cdf0 -s ours am:
515c909b33 -s ours am:
a7020eafc3 -s ours am:
111b798be8 -s ours
am:
544b3300e5 -s ours
Change-Id: Ibd43b4b29267536e83fe305684629908a0d32df0
Pavlin Radoslavov [Tue, 18 Jul 2017 19:33:50 +0000 (19:33 +0000)]
Merge "Add missing extension length check while parsing BNEP control packets" into nyc-dev am:
c3619e1436 am:
d647097c74 am:
0a9673bceb am:
88f2ae07f4 am:
384e1dff72 -s ours am:
cc56e94905 am:
23195b1411
am:
b342b6d201
Change-Id: I471d1577147e88c21c67aa06be7876a7902f69b4
Android Build Merger (Role) [Tue, 18 Jul 2017 19:33:41 +0000 (19:33 +0000)]
Merge "Merge "Add missing extension length check while parsing BNEP control packets" into mnc-dev am:
fdcad53f8e am:
fd94c15a5a am:
0cea290eee am:
97922c7401 am:
c0008b6c2f am:
42b29f1ce6 am:
5328c7a32d am:
33f4a8065e am:
471e964d69 am:
1c780fabd5 am:
f4e2ea3bc2" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Tue, 18 Jul 2017 19:33:40 +0000 (19:33 +0000)]
Merge "Merge "Add missing extension length check while parsing BNEP control packets" into mnc-dev am:
fdcad53f8e am:
fd94c15a5a am:
0cea290eee am:
97922c7401 am:
c0008b6c2f am:
42b29f1ce6 am:
5328c7a32d am:
33f4a8065e am:
471e964d69 am:
1c780fabd5 am:
2ebd8f5769" into oc-dr1-dev-plus-aosp
Pavlin Radoslavov [Tue, 18 Jul 2017 19:33:33 +0000 (19:33 +0000)]
Merge "Add missing extension length check while parsing BNEP control packets" into mnc-dev am:
fdcad53f8e am:
fd94c15a5a am:
0cea290eee am:
97922c7401 am:
c0008b6c2f am:
42b29f1ce6 am:
5328c7a32d am:
33f4a8065e am:
471e964d69 am:
1c780fabd5
am:
f4e2ea3bc2
Change-Id: Iaf85cf19dfb8ebe761dd6e9d20765b3791858ed4
Pavlin Radoslavov [Tue, 18 Jul 2017 19:33:33 +0000 (19:33 +0000)]
Merge "Add missing extension length check while parsing BNEP control packets" into mnc-dev am:
fdcad53f8e am:
fd94c15a5a am:
0cea290eee am:
97922c7401 am:
c0008b6c2f am:
42b29f1ce6 am:
5328c7a32d am:
33f4a8065e am:
471e964d69 am:
1c780fabd5
am:
2ebd8f5769
Change-Id: I29e3b58fc655b9ecb956bb4ec013eea9f31f6f97
Android Build Merger (Role) [Tue, 18 Jul 2017 19:33:28 +0000 (19:33 +0000)]
Merge "Free p_pending_data from tBNEP_CONN to avoid potential memory leaks am:
8f18afd26c am:
ffa87779a1 am:
7eda996189 am:
ba12732aad -s ours am:
107bb0f68d -s ours am:
73df1dfa11 -s ours am:
3fe34fe3fb -s ours am:
6d3312cdf0 -s ours am:
515c909b33 -s ours am:
a7020eafc3 -s ours am:
af917e81bd -s ours" into oc-dr1-dev-plus-aosp
Pavlin Radoslavov [Tue, 18 Jul 2017 19:33:18 +0000 (19:33 +0000)]
Free p_pending_data from tBNEP_CONN to avoid potential memory leaks am:
8f18afd26c am:
ffa87779a1 am:
7eda996189 am:
ba12732aad -s ours am:
107bb0f68d -s ours am:
73df1dfa11 -s ours am:
3fe34fe3fb -s ours am:
6d3312cdf0 -s ours am:
515c909b33 -s ours am:
a7020eafc3 -s ours
am:
111b798be8 -s ours
Change-Id: If0a0c049f66f754f35fb0ae115ee4b0b7991fc0e
Pavlin Radoslavov [Tue, 18 Jul 2017 19:33:18 +0000 (19:33 +0000)]
Free p_pending_data from tBNEP_CONN to avoid potential memory leaks am:
8f18afd26c am:
ffa87779a1 am:
7eda996189 am:
ba12732aad -s ours am:
107bb0f68d -s ours am:
73df1dfa11 -s ours am:
3fe34fe3fb -s ours am:
6d3312cdf0 -s ours am:
515c909b33 -s ours am:
a7020eafc3 -s ours
am:
af917e81bd -s ours
Change-Id: Ifadf30fc86702322d8ab003ea7e6cd3e040cc4fe
Pavlin Radoslavov [Tue, 18 Jul 2017 19:31:55 +0000 (19:31 +0000)]
Merge "Add missing extension length check while parsing BNEP control packets" into nyc-dev am:
c3619e1436 am:
d647097c74 am:
0a9673bceb am:
88f2ae07f4 am:
384e1dff72 -s ours am:
cc56e94905 am:
bdf4687dc9
am:
6e413bc9ee
Change-Id: Iba5333643839bbfcf391cf2802f6a3a9a58718b5
Pavlin Radoslavov [Tue, 18 Jul 2017 19:31:36 +0000 (19:31 +0000)]
Free p_pending_data from tBNEP_CONN to avoid potential memory leaks am:
f8fc7f7d11 am:
2b53cd05f2 am:
28d58cb2c8 am:
9fa3d4f2c7 am:
92744bc2ce -s ours am:
27835e4e3e -s ours am:
0aa2d9bbb9 -s ours
am:
a6bbbccc90 -s ours
Change-Id: Id3ade33b257c9e139d9d73a1ccfc76c1fd18edb7
Pavlin Radoslavov [Tue, 18 Jul 2017 19:31:21 +0000 (19:31 +0000)]
Merge "Add missing extension length check while parsing BNEP control packets" into nyc-dev am:
c3619e1436 am:
d647097c74 am:
0a9673bceb am:
88f2ae07f4 am:
384e1dff72 -s ours am:
cc56e94905
am:
23195b1411
Change-Id: I27e1a3fa5db1232fd3ac199f96e7320afd5f5a31
Pavlin Radoslavov [Tue, 18 Jul 2017 19:31:09 +0000 (19:31 +0000)]
Merge "Add missing extension length check while parsing BNEP control packets" into mnc-dev am:
fdcad53f8e am:
fd94c15a5a am:
0cea290eee am:
97922c7401 am:
c0008b6c2f am:
42b29f1ce6 am:
5328c7a32d am:
33f4a8065e am:
471e964d69
am:
1c780fabd5
Change-Id: Ic8e89a3c82a113e796b7097bfcf019d341bbcff2
Pavlin Radoslavov [Tue, 18 Jul 2017 19:31:09 +0000 (19:31 +0000)]
Merge "Add missing extension length check while parsing BNEP control packets" into mnc-dev am:
fdcad53f8e am:
fd94c15a5a am:
0cea290eee am:
97922c7401 am:
c0008b6c2f am:
42b29f1ce6 am:
5328c7a32d am:
33f4a8065e am:
471e964d69
am:
1c780fabd5
Change-Id: Id09d66ad7aed3b9d88c8ed2426a190cb01e4e440
Pavlin Radoslavov [Tue, 18 Jul 2017 19:30:51 +0000 (19:30 +0000)]
Free p_pending_data from tBNEP_CONN to avoid potential memory leaks am:
8f18afd26c am:
ffa87779a1 am:
7eda996189 am:
ba12732aad -s ours am:
107bb0f68d -s ours am:
73df1dfa11 -s ours am:
3fe34fe3fb -s ours am:
6d3312cdf0 -s ours am:
515c909b33 -s ours
am:
a7020eafc3 -s ours
Change-Id: Ic4356a48ce3657abab7f3e46f5fafefe4f6dd908
Pavlin Radoslavov [Tue, 18 Jul 2017 19:30:50 +0000 (19:30 +0000)]
Free p_pending_data from tBNEP_CONN to avoid potential memory leaks am:
8f18afd26c am:
ffa87779a1 am:
7eda996189 am:
ba12732aad -s ours am:
107bb0f68d -s ours am:
73df1dfa11 -s ours am:
3fe34fe3fb -s ours am:
6d3312cdf0 -s ours am:
515c909b33 -s ours
am:
a7020eafc3 -s ours
Change-Id: Ifd89fb852bcaa3fc4028d2cc9bedea73e8018e73
OSDN Git Service
