| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
| |
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Id658b3485fdc0025bc44850be9f23bb2d2146d9b
(cherry picked from commit 6c0f22f324ed0bdf9dea3e803e5ee6176d03fdb4)
|
|
|
|
|
|
|
| |
Test: manual
Bug: 79488381
Change-Id: I723866ed40d3647fed99875f659bb95df96a6969
(cherry picked from commit 5bb66307b555b17d1764e116316ce50c687c9653)
|
|
|
|
|
|
|
| |
Bug: 80261585
Test: compilation
Change-Id: Icf55747dc948bcce140a12658237554938e2d717
(cherry picked from commit 02f47a752c818277b31852e3ff940764d5c7f9c7)
|
|
|
|
|
|
| |
Bug: 74121659
Test: Compiles
Change-Id: Idf58e7b25b41ae1bd43cdd51de424b18e03cc7e8
|
|
|
|
|
|
|
|
|
|
| |
Bug: 74202041
Bug: 74196706
Bug: 74201143
Test: manual
Change-Id: Ic25f7f3777d0375f76cc91e4d129b1636f1c388d
(cherry picked from commit ff15adf5150527db1012b9f7777066522835e2db)
CVE-2018-9359, CVE-2018-9360, CVE-2018-9361
|
|
|
|
|
|
|
|
|
| |
- fix formatting difference and use official 6.0.1 patches from r81
(e.g. commit 33427d54f31adaf5b9c697f5ce642fda1dc01946 and
commit 7f17ba1f8e475706727df7c50bc31ffb191d1f9d don't match googles patches
for 6.0.1)
Change-Id: I3187d1be2bcbc896a60100eda7c42d0e7bb5131f
|
|
|
|
|
|
|
|
|
| |
Bug: 63146105
Test: External script
Change-Id: I1f2c871e3fcf57aabdad9d07905e6dae643bd496
Merged-In: I1f2c871e3fcf57aabdad9d07905e6dae643bd496
(cherry picked from commit 8810ffba990f8f53172c445ebde8707525bb7813)
CVE-2017-0781
|
|
|
|
|
|
|
|
|
|
| |
Bug: 34946955
AOSP-Change-Id: Ieff690edd3aa527a0639483ec8e1e3b661f0ecc4
Merged-In: I0b6f50dee05a58db8c043b4d01fb58c9acbeede9
CVE-2017-0602
Change-Id: I2ef24140c3d26b3e6cf113195951fe57f61f4c1e
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
commit 2772d76990d8424ef3c629dba164fc7111b37db3 caused
a regression in A2DP for Broadcom Bluetooth chipsets
by not sending the HCI_BRCM_SET_ACL_PRIORITY command.
Change this logic so the ACL priority adjustment occurs
unconditionally for non-Broadcom chipsets only.
Reproduction steps: Entering Bluetooth settings which
triggers inquiry and makes the device discoverable while
simultaneously using 2.4GHz WiFi.
Change-Id: Ic40dc8d66ae30c71e0ddf1a2eaeb19fee1e87ecb
|
|\
| |
| |
| | |
into cm-13.0
|
| |\ |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Problem: Remote device can't be removed from paired list.
Cause: After connection collision, lcb is removed after
connection request is rejected by soc but acl entry is not
removed. So, for upper layer, acl connection always remains
up.
Fix: Removed acl connection and acl entry when connection
complete is received and lcb is not present.
CRs-Fixed: 987968
Change-Id: Ie2049217e436704262f06d0c0dc51611697cc29a
|
|\| |
| | |
| | |
| | |
| | |
| | | |
into cm-13.0
Change-Id: Ib0f8f87bd5655ce85227bfc016044b1daa09ebe7
|
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
- Optimize the L2cap Flow control tx timer
to avoid frequent start and stop of same
timer.
- it will restart the timer instead of stop
and start.
- Changes made in btm timer functions also
to avoid scheduling of next timer in queue
though is not required as the same timer
is supposed to start.
CRs-Fixed: 934414
Change-Id: Idd43a71617a27c6d70fafa4e31c16f735a1a9425
|
| |
| |
| |
| |
| |
| | |
Transport is checked in code even when BLE_INCLUDED = FALSE.
Change-Id: I6eaaad1242e943835b6e040687562801451cfc2a
|
|\|
| |
| |
| |
| |
| | |
into cm-13.0
Change-Id: Ic7851f38b6ca4b82ab9a0b96e7e494849944e5c6
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Implement Split A2dp to process AVDTP Signalling commands
from host and media packet handling from Controller.
Host uses vendor specific commands to let controller know
the media channel configurations for controller to form
the media packets accordingly.
Change-Id: I7a98177a8125fd70b057bb514f0d870971a45bcf
|
| |\
| | |
| | |
| | | |
requests"
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Min connection interval is updated to BTM_BLE_CONN_INT_LIMIT(11.25 ms)
if the requested min is < 11.25 ms. The L2CAP connection update request
is rejected if max connection interval requested is < 11.25 ms since
max connection interval becomes less than the min connection interval
(11.25 ms) in the host logic in l2cble_process_sig_cmd fucntion. Hence,
max connection interval parameter requests with 7.5 ms are rejected
currently.
CRs-fixed: 934966
Change-Id: I59afb07c9f8c1eb4cb1fc4c938710ec24761debb
|
| |/
| |
| |
| |
| |
| |
| |
| | |
1. A2dp acl link priority is set to high once streaming starts
2. Allocation min 2 ACL bufferswq to high priority link
CRs-fixed: 647447
Change-Id: I8f7742ae193998643ff2a12bf87f9874844ee0f7
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
BR/EDR connection and disconnection is currently adjusting the amount of
packets each link(including LE) may send to the HCI without an ack coming
back usign the function l2c_link_adjust_allocation.
This change prevents the adjustment of LE link's link transmit quota when
a BR/EDR connection or disconnection is done.
Change-Id: I8ac78603de61c423447cd200e31ffc339bffe132
|
|/
|
|
|
|
|
|
| |
1. A2dp acl link priority is set to high once streaming starts
2. Allocation min 2 ACL bufferswq to high priority link
CRs-fixed: 647447
Change-Id: I8f7742ae193998643ff2a12bf87f9874844ee0f7
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
DUT stack information logging:
-L2CAP configuration parameter,
-Device role information
-L2CAP flow control and congestion information
-L2CAP State machine and events
-RFCOMM credits count
change-id: I6e74bdb1cda4455c50314f67bbcd19accd3c31e4
CRs-Fixed:602294
Bluetooth:CoreStack: DUT Stack Logging set2
DUT stack information logging:
-L2CAP CIDs, PSM and MTU
-removed RFCOMM credits count from default logs
change-id: I7a25d751b200e8ece87f9e5fd79ab48d736087cb
CRs-Fixed: 602294
Bluetooth: Add debug logs for the remote device information
change-id: I857016c056635907586d8a9d0d577edde4efc34a
Add logs to provide the below remote device information
- Remote device features
- Service class
- LMP version, subversion, manufacturer
- Role changed event
CRs-Fixed: 602291
Change-Id: I99f51841716e27ef7170b7566379b975c99a65e0
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This patch fix a special case where DUT is paired & connected
with only one device, which has capbility to intiate paring as
soon as DUT unpair same remote device. As DUT is paired with
only one device, In this case Once DUT unpair remote device. DUT
goes for inquiry & at same time remote device initiates pairing
if Bludroid stack recieve pairing request before the inquiry
start then DUT should not go for inquiry, As DUT is already in
BONDING state.
Change-Id: I0e1ec0fdb963921629e5c52f495ae2013e679a03
SDP: Fix for SDP query in certification test with Invalid PduSize
Bluedroid stack is only checking parameter length and input data length.
Added an extra logic to handle invalid data after getting last valid data.
Change-Id: I47eafb2c24e73b472c31a2fb47e02d48c5e04f6c
Bluetooth: GAP: Don't update short name if the device paired
Don't notify the BT APP about the shortened device name which
will be part of EIR response,incase of device is already
paired.
Incase if the alias name present for that device, it
will notify th BT APP alias name as the actual device name.
Change-Id: Ia64e1e90aae8c4e0cc52643ce3bbbb1332fe5b66
Bluetooth: GAP: Update name as part of Discovery of services
Update the remote device name to upper layers as part of
discovery of remote device services.
Change-Id: I24d899c1f5ccc81d8b0c4257abae16a7bf5d4682
Bluetooth: GAP: Handle security failure with invalid handle
Return NULL incase of invalid handle when finding a device
based on the handle. This will make sure to avoid giving
a invalid entry from the device list.
Also send authentication failure in case of invalid handle.
Change-Id: Ia95d10ae95cfa1750386233ee90f01899061294e
Bluetooth: Handled delayed info rsp from remote during SDP
DUT initiates connection with out waiting for information response
from remote device during SDP.
Change-Id: Iee0251f8f81923b1291983b66b31c78e14d21af0
Bluetooth: GAP: Changing the security to general bonding
Changing the security from non bonding to general bonding
in BTM_SEC_OUT_AUTHENTICATE condition.
Change-Id: I65d2ec4466e2bd81df2cc7e2936e05159a8645ed
Bluetooth: Store local and remote io caps before RNR
Stores the loc_io_caps nad rmt_io_caps when the remote
name request is called, and these will be retrieved
in the function bta_dm_pinname_cback.
Change-Id: I4b2156d7101acabb1ded65bd21d49a9c4551f8db
Bluetooth:GAP: Remove bonded device info on pairing rejected
Change-Id: Ic9e5e1ed70d304edd3dbca82a73833753fa0093c
Remove bonded device information from the BT-IF layer storage
When authentication failed with reason pairing not allowed from remote.
Change-Id: I71b902ae201e32a0fb18fd3bce52fd86e8cbcdd5
CRs-Fixed: 902577
|
|
|
|
|
|
|
|
|
|
| |
- This fix avoids NULL pointer dereferences,
Array Index Out of Bounds Exceptions
and Banned funciton in the bluedroid code
space of Bluetooth.
CRs-Fixed: 890309, 890321
Change-Id: I24ae794ee01b65b5ab15c73cd82677b0481910ad
|
|
|
|
|
|
|
|
| |
This patch will ensure that a direct connection is cancelled by
the host if a connection from the same remote takes place
as an advertiser.
Change-Id: I0419de6f4d05837b7772ac4336713bb7a7c6eefe
|
|
|
|
|
|
|
|
|
|
| |
-Define DUT Default desired role as master
-Accept incoming connection with DUT role as slave for
list of carkits and headsets which are blacklisted.
Change-Id: Ie6af63b50debd417ce2d54b28b83d95ef4f695a6
CRs-Fixed: 892194
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Restricted invalid attr len in SDP_DeleteAttribute as
pointer is trying to access invalid memory when attr_len
is invalid
Registering PNP record before PAN profile as PNP record
should be registered before profiles.In some cases PAN and
PNP SDP registration colliding and leading to memory
corruption in SDP DB.
Change-Id: Ib6d2120c7ef1d10633fa905d6b853281efaf0ecd
Bluetooth: Cleanup ACL link during restarting pending ACL connection
This fix removes the previously held ACL link with the BR_EDR
device before trying to create a new pending connection with the
same device.
Change-Id: Iac941794e2fc86c48781edc86492146ab5c21eae
Bluetooth: Cleanup the lcb variables properly on reuse
- Cleanup all relevant link control block variables
like send_not_acked, partial_segment_being_sent
and stop the info response timer to reuse the same
LCB.
- L2cap layer will reuse the same lcb if the link is
disconnected and wants to re-establish the link.
Change-Id: I822b0ee350574bbeb5b3c86a349d1471fa45761a
CRs-Fixed: 885782
Change-Id: I15f83b5c1a88d248d29080123ebbf4652f2cb340
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
LE L2CAP Connection Oriented Channel implementation for
credit based flow control on LE L2CAP.
- This feature is enabled only when BLE feature is enabled.
- Handled signalling commands on channel id 5 to establish
the connection of LE COC.
- Implemented the SM for LE L2CAP channel to handle events
from App layer and hci layer.
- Introduced security levels for LE L2CAP channels.
- Introduced tranport variable for major functions where
BREDR and LE shares common data structures.
- Implemented segmentation and reassembly of LE L2CAP SDU.
- Introduced congestion mechanism for LE L2CAP channel
- As the new LE L2CAP callbacks not required for existing
BREDR services, made it as null for newly introduced
LE L2CAP callbacks.
- New APIs introduced for LE L2CAP connection establishment.
- New APIs provided for LE L2CAP security procedure.
- Relevent L2cap APIs from Test app interface exposed to the
test tool.
- New macros, definitions, structures introduced for LE L2CAP
channel establishment/data tranfer.
CRs-Fixed: 776657
Change-Id: I50a24374659f9802cbc92421db139f75f2790f2e
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Use case: Execute the L2cap test suite on Codenomicon tool
(1)From tool Codenomicon Defensics 11 menu Utilities > Bluetooth Scan, paired Bluetooth between pc and phone.
(2)From Defensics 11 Settings ,choose paired phone Bluetooth to be Target Bluetooth device address in Basic configuration.
(3)Run the test case " Security - l2cap ".
(4)When run to the number 28, 29 test case,check the phone.BT turn off and turn on automatcially
Failure: BT crash observed due to invalid MTU packets from test tool
Root cause: L2cap is not validating packets in L2cap Process Commands
Fix: Fixed by sending reject cmd for invalid commands from tool
Change-Id: I8c503ab77d8fca3728a84c3457d8115e31ee3a13
|
|
|
|
|
|
|
|
|
|
| |
This patch adds support to enable logging for hid host's and client's
stack components dynamically. Also some logs for host and cleint
are added under verbose logging level which would help in latency
measurements.
Change-Id: I06de0ea89b8f5e40466519fe60aead6497b6cf11
CRs-Fixed: 608230
|
|
|
|
|
|
|
|
|
|
|
|
| |
As a side-effect to increasing BTM_BLE_CONN_INT_MIN, valid connection
parameter updates can be rejected if the requested minimum is < 11.25ms,
but the requested maximum is >= 11.25ms.
This patch introduces a new parameter "BTM_BLE_CONN_INT_LIMIT" and
resets BTM_BLE_CONN_INT_MIN to the HCI spec defined minimum.
Bug: 22245224
Change-Id: I6a2e4d18488b63570f7d0070413d00f16a7fdba1
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Use Case:
1) pair and Connect to HOGP mouse
2) Disconnect from setting menu.
Failure:
Disconnect is not sent immediately
Root Cause:
While disconnecting we start lcb's default timeout of 4 seconds before
disconnecting the link. Since we are removing fixed channels associated
to a remote, setting idle timeout to 0 for immediate disconnection.
Bug: 21877809
Change-Id: I39fedb6cac6f952149cb2722d028115fbdc20b70
|
|
|
|
| |
Change-Id: I8ac40e9cfe6dd015f40c6f493727e123a0d247e6
|
|
|
|
| |
Change-Id: Idef7239b07115be9290d7cca6610c603ffb3afa5
|
|
|
|
|
|
|
|
|
|
| |
Fix for bonded devices that cannot be removed from resolving list when
scanning, advertising or when a connection is being initiated.
Suspend all active adv, scanning or connection initiation upon
completion of any resolving list operation.
Original author: Chaojing Sun <cjsun@broadcom.com>
Change-Id: Id104dace2944b1878eaf65b93aba3d01e477191d
|
|
|
|
|
|
|
|
| |
This is not a comprehensive fix. More work is necessary to ensure the
correct separation of BLE_INCLUDED TRUE/FALSE as well as removing many
of the hacked-up if() statements resulting from this patch.
Change-Id: I1812594feba0bf43369096e472a8b18cde305255
|
|
|
|
| |
Change-Id: I22d97303054eccc876c4a9c7c0a50e369ff4fa62
|
|
|
|
| |
Change-Id: Ie4ecab207f83d8ec27c5922c0c794f8bd824255f
|
|
|
|
|
|
|
|
|
| |
Included support for LE data packet extension feature according
to BT 4.2 spec. This patch checks if the controller supports LE
packet extension and provides functions to set the PDU length.
Bug: 20013956
Change-Id: I6a92970fede2f793ad48c9fa2e0247ad00297533
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
e07ad10 merge in m-wireless-internal-release history after reset to d232721ae5e5b6949a5249f0d116408b8a3c5f1d
d232721 L2CAP socket - fix merge errors
899b771 BR/EDR secure connections support
7fb0da6 Support numeric comparison in SMP
aa351f2 merge in m-wireless-internal-release history after reset to 399e89150b3df87172bdf92d54712b379324b149
399e891 Fix for AVRCP CTRL stops sending pass through command
daddea9 Free Avrcp Controller callbacks on Cleanup
764babe Protect reset of out stream with mutex
444a8da LE Privacy 1.2 and LE secure connections
8372aa5 L2CAP and SDP Search API for BT profiles (2/2)
fd422a7 Update Service Availability.
2a0652a merge in m-wireless-internal-release history after reset to 0b47e0a35c16f5b7d77c30ec1c095ed92ff4fd74
78d0f4c merge in m-wireless-internal-release history after reset to m-wireless-internal-dev
0b47e0a Avoid duplicate disconnection callbacks for fixed channel connections
5646973 Add a section on assertions to the style guide.
d768767 Merge "Avoid null-pointer dereference in l2c_release_lcb()" into m-wireless-dev
ef92b53 Avoid null-pointer dereference in l2c_release_lcb()
4bf68bf merge in m-wireless-internal-release history after reset to f538707fe64c62b1dbb8e4210e4a1bfa0bab2b56
de6ac86 Add a 'Bluedroid conventions' section to the style guide.
1b80439 Add a section to the style guide on variable declarations.
485f19e merge in m-wireless-internal-release history after reset to 4540f59bc447dc2b7b31a3e974b74a60b2417e7d
bef8940 merge in m-wireless-internal-release history after reset to 841c9103cad1898ceca87b734acd4d4537f9f452
ab4c38c merge in m-wireless-internal-release history after reset to a7e698f5a9e062f62e21bc435643975c30bab846
2807a74 merge in m-wireless-internal-release history after reset to a7e698f5a9e062f62e21bc435643975c30bab846
99dbe9a merge in m-wireless-internal-release history after reset to 78c0b060f29b7b7014adddb2f98bf6ae9755c488
f7f8399 merge in m-wireless-internal-release history after reset to a5371c238b4e874d8313ac56a23451e7345ff541
3aa60d7 Make A2DP audio HAL a shared library again
3256a31 Move unused include file out of hci_audio.h
b866b69 Add option for schedule_next_instance to force rescheduling
4ae5e3e Ensure alarms are called back when they expire in the past
a7bd03e Rewrite alarms to use a single posix timer instance
88e7b15 Resolved hardware error observed during SCO Connection setup
Change-Id: Ib9a0a2ffca1d4811a9a9e56674bf43275d8b2205
|
| |
| |
| |
| |
| |
| | |
Bug: 19816438
Original author: Chaojing Sun <cjsun@broadcom.com>
Change-Id: I5951f4d4e038f8348a62aa6d19b2111bae0b3ecc
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Added support for exposing L2CAP to Java such that OBEX over L2CAP
is made possible.
Added support to create SDP records as a seperate step.(as opposed to
creating a SDP record when a BluetoothSocket is created).
This allows both a RFCOMM channel and a L2CAP PSM to be included in a
SDP record. (Additionally the content of the SDP record is set by the
profile in Java, in stead of beeing hardcoded in the socket layer.)
This completes the L2CAP channel exposure to Java.
Change-Id: Iaf68a07d910145cdd33e940d73cd680f79164100
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Fixed channel connections are getting a disconnect callback when the
HCI command is issued and when the HCI disconnect completes. This
causes problems if the upper layer trying to reconnect at link
disconnecting state.
Triggering the disconnect callback only once solves this problem.
Original author: Chaojing Sun <cjsun@broadcom.com>
Bug: 19816438
Change-Id: Ib661c968e586975a7fc7244e2d0745f71d52e3e9
|
| |
| |
| |
| | |
Change-Id: Id46d678e45797c4d3d3c8e024f42cfd06b1d2da2
|
|\|
| |
| |
| | |
Change-Id: Ibc6d6e691b7f97611d16f96220346dfd6ffbbf52
|
| |
| |
| |
| |
| |
| |
| |
| | |
This change prevents the cancellation of direct LE connection
from removing the lcb, if there is already an LE connection up
with DUT as peripheral
Change-Id: If11759e40d19f428959b28025dde2d65b6ed7cd6
|
| |
| |
| |
| |
| |
| |
| |
| | |
Some standard library functions are used while relying on bionic headers
including the headers the functions were actually declared on. Add those
missing #includes so that bluetooth.default.so will compile on glibc.
Change-Id: Ied9f89ce5a05911fca63f6bfe1b8cc8196ab3b1c
|
| |\
| | |
| | |
| | | |
m-wireless-dev
|
| | |
| | |
| | |
| | |
| | | |
Bug: 18925497
Change-Id: I5a20e38ffebce4b251e4728944fce73db50e18f8
|