OSDN Git Service

android-x86/system-bt.git
9 years agoosi: Fix compile error due to API change on AOSP
Arman Uguray [Tue, 14 Jul 2015 19:32:33 +0000 (12:32 -0700)]
osi: Fix compile error due to API change on AOSP

All LOG_* functions require a first argument "tag", which was added on AOSP.

Change-Id: I2e678baa5da1cbf7073291983a0339dade6abca8

9 years agoam fd4745ec: service: Some fixes from end-to-end/user testing.
Ian Coolidge [Tue, 14 Jul 2015 20:27:28 +0000 (20:27 +0000)]
am fd4745ec: service: Some fixes from end-to-end/user testing.

* commit 'fd4745ec554a95ea98230fcede779421ad89e363':
  service: Some fixes from end-to-end/user testing.

9 years agoam 9f0fa1b6: Add additional BDA ranges for Nexus Remote workaround
Andre Eisenbach [Tue, 14 Jul 2015 19:32:50 +0000 (19:32 +0000)]
am 9f0fa1b6: Add additional BDA ranges for Nexus Remote workaround

* commit '9f0fa1b60e20a1fa3f0845d72dac740e06b245d7':
  Add additional BDA ranges for Nexus Remote workaround

9 years agoAdd additional BDA ranges for Nexus Remote workaround
Andre Eisenbach [Tue, 14 Jul 2015 16:49:37 +0000 (09:49 -0700)]
Add additional BDA ranges for Nexus Remote workaround

As per feedback from manufacturer.

Bug: 21817410
Change-Id: I4b5b3d8d99f9299754221968a5e1ca5f21cb9478

9 years agoam e53454f7: Additional BDA range for Nexus Remote secure connections blacklist
Andre Eisenbach [Tue, 14 Jul 2015 16:24:52 +0000 (16:24 +0000)]
am e53454f7: Additional BDA range for Nexus Remote secure connections blacklist

* commit 'e53454f71c1c894fa3976cfe5f5a22d50b2ff28b':
  Additional BDA range for Nexus Remote secure connections blacklist

9 years agoMerge commit '27c4e634' into mnc-dr-dev-plus-aosp
Andre Eisenbach [Tue, 14 Jul 2015 16:20:22 +0000 (09:20 -0700)]
Merge commit '27c4e634' into mnc-dr-dev-plus-aosp

Change-Id: Ideb2a7be573148d534cd94cb34ed5fe46b76d1e6

9 years agoam 115c6b1d: service: Remove local copies of base and modp_b64
Arman Uguray [Tue, 14 Jul 2015 15:21:09 +0000 (15:21 +0000)]
am 115c6b1d: service: Remove local copies of base and modp_b64

* commit '115c6b1dbd43e8c390483f537dfb0c477d449269':
  service: Remove local copies of base and modp_b64

9 years agoam 0ca99052: gn-build: Add BUILD files for libchrome
Arman Uguray [Tue, 14 Jul 2015 15:21:08 +0000 (15:21 +0000)]
am 0ca99052: gn-build: Add BUILD files for libchrome

* commit '0ca99052be04bfd85c9c1ae2601214bedf90b238':
  gn-build: Add BUILD files for libchrome

9 years agoservice: Some fixes from end-to-end/user testing.
Ian Coolidge [Tue, 14 Jul 2015 01:22:46 +0000 (18:22 -0700)]
service: Some fixes from end-to-end/user testing.

* Send responses to ExecWrite requests.
* Provide valid data on write responses.
* Properly destruct Gatt::Server objects.
* Synchronize CoreStack 'enable' calls properly.

Change-Id: I4e9eed1979b10abccc7ae487e2c7d90d491e38d9

9 years agoservice: Remove local copies of base and modp_b64
Arman Uguray [Wed, 8 Jul 2015 22:33:05 +0000 (15:33 -0700)]
service: Remove local copies of base and modp_b64

Since libbase is now available on AOSP (under libchrome) Bluetooth code can
depend on it rather than maintain its own copy a subset of base sources (and
modp_b64 dependencies).

Dependent CL: http://r.android.com/158335

Bug: 22175181
Change-Id: I3a301e49353598633ad857ac4345d0361c273beb

9 years agogn-build: Add BUILD files for libchrome
Arman Uguray [Wed, 8 Jul 2015 00:00:09 +0000 (17:00 -0700)]
gn-build: Add BUILD files for libchrome

This CL adds GN build files for libchrome, which is the ChromeOS/Brillo library
for many C++ tools, include libbase. I added a new GN build target for "base"
under secondary sources with a GN build file for libchrome which currently lives
in platform/external/libchrome in AOSP.

To build, clone libchrome into third_party/libchrome and remove
third_party/libchrome/base/BUILD.gn. Also clone external/modp_b64 into
third_party/modp_b64. Eventually I will have scripts set up to do
this automatically.

This means that we can start developing against libbase while running GN builds
on Goobuntu but this would break the tree until libchrome is buildable within
the Android build system (http://r.android.com/158392). So Brillo/Android builds
will depend on libchrome using the conventional Android.mk means.

Bug: 22175181
Change-Id: I9a737aa785488e5bc0ca1adc087d1d5dfcdf3bea

9 years agoAdditional BDA range for Nexus Remote secure connections blacklist
Andre Eisenbach [Mon, 13 Jul 2015 16:36:03 +0000 (09:36 -0700)]
Additional BDA range for Nexus Remote secure connections blacklist

Bug: 21817410
Change-Id: I5c5f6da9e8326e4c9424907337331b39fb67b444

9 years agoMove pairing auto-retry workaround to new interop db
Andre Eisenbach [Mon, 6 Jul 2015 22:43:15 +0000 (15:43 -0700)]
Move pairing auto-retry workaround to new interop db

Change-Id: I7177aaa0e2d0c3b0fa79ae655c0171f0703c54f3

9 years agoam 71334dcd: Do not reject valid connection parameter updates
Andre Eisenbach [Fri, 10 Jul 2015 18:05:49 +0000 (18:05 +0000)]
am 71334dcd: Do not reject valid connection parameter updates

* commit '71334dcd2c58564a195dade1f862f052ecd07b50':
  Do not reject valid connection parameter updates

9 years agoDo not reject valid connection parameter updates
Andre Eisenbach [Fri, 10 Jul 2015 07:37:45 +0000 (00:37 -0700)]
Do not reject valid connection parameter updates

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

9 years agoam 08c08fc0: Fix a bug when responding to AVRCP UNIT_INFO and SUBUNIT_INFO
Pavlin Radoslavov [Fri, 10 Jul 2015 11:00:18 +0000 (11:00 +0000)]
am 08c08fc0: Fix a bug when responding to AVRCP UNIT_INFO and SUBUNIT_INFO

* commit '08c08fc0015c3c5e864da080dba0712ee89a6712':
  Fix a bug when responding to AVRCP UNIT_INFO and SUBUNIT_INFO

9 years agoam 26c3dd41: Fail LE secure pairing for secure only peripherals
Nitin Arora [Fri, 10 Jul 2015 10:14:53 +0000 (10:14 +0000)]
am 26c3dd41: Fail LE secure pairing for secure only peripherals

* commit '26c3dd41b294b7f6d0ca7198b00ed1e1ef32dfb9':
  Fail LE secure pairing for secure only peripherals

9 years agoFix a bug when responding to AVRCP UNIT_INFO and SUBUNIT_INFO
Pavlin Radoslavov [Fri, 10 Jul 2015 00:57:20 +0000 (17:57 -0700)]
Fix a bug when responding to AVRCP UNIT_INFO and SUBUNIT_INFO

Assign appropriately the p_rsp_data pointer to point in the
buffer with the response.

Bug: 22307858
Change-Id: I2f77f290ff2c62c09b3be18ff047167a48c7c9d4

9 years agoam 8f766350: Reset the ACL connection data on ACL disconnection
Srinu Jella [Fri, 10 Jul 2015 07:56:59 +0000 (07:56 +0000)]
am 8f766350: Reset the ACL connection data on ACL disconnection

* commit '8f766350bbb7026ddf34b73c9d87967decff792b':
  Reset the ACL connection data on ACL disconnection

9 years agoFail LE secure pairing for secure only peripherals
Nitin Arora [Thu, 25 Jun 2015 17:48:56 +0000 (10:48 -0700)]
Fail LE secure pairing for secure only peripherals

This change allows the host peripheral which initiates the pairing
to reject the pairing in case the remote does not support
secure LE connections and the host DUT is in secure connections
only mode.

Bug: 22203134
Change-Id: If58f791cb575d6b66c361f58e574b613d5686047

9 years agoReset the ACL connection data on ACL disconnection
Srinu Jella [Fri, 3 Jul 2015 10:01:11 +0000 (15:31 +0530)]
Reset the ACL connection data on ACL disconnection

Use case: Reconnection of legacy mouse.

Failure: Not able to reconnect with mouse if the previous
connection rejected was with SC enabled device.

Test Steps:
1. Pair and connect remote devices.
2. Start streaming music over headset and Disconnect HID
   mouse.
3. Inquire and try to pair with any DUT which supports
   secure connection.
4. Cancel pairing and Turn OFF remote headset.
5. Now try reconnection from HID mouse.

Root Cause: When the secure connection is established, it will
have the 3 pages filled, and when the same acl entry is reused
for next mouse reconnection, only one page is getting over
written because legacy HID will have only one page supported
and remaining 2 pages still holds the previous device's data.

Fix: Fixed it by resetting the ACL entry when the ACL is
disconnected so that even though one page is copied and
remaining pages will not contain valid data.

Bug: 22249108
Change-Id: Icd96f22fe0787ef5845ee02940c2b0eacf7a2bbd

9 years agoam 549c64d1: Fix security vulnerabilities in string operations
Miao Chou [Fri, 10 Jul 2015 03:12:32 +0000 (03:12 +0000)]
am 549c64d1: Fix security vulnerabilities in string operations

* commit '549c64d1eb96f8096915a39c2a3447190c851bce':
  Fix security vulnerabilities in string operations

9 years agoFix security vulnerabilities in string operations
Miao Chou [Thu, 9 Jul 2015 19:21:27 +0000 (12:21 -0700)]
Fix security vulnerabilities in string operations

This CL prevents functions, bta_ag_hfp_result and bta_hf_client_send_atd, from
the potential strings overflowing.

Bug: 20674686,20677309
Change-Id: Iaef720fc784e020f237feb86e17857bddf57bbfc

9 years agoam 680959b0: Add missing data initialization
Pavlin Radoslavov [Thu, 9 Jul 2015 20:22:24 +0000 (20:22 +0000)]
am 680959b0: Add missing data initialization

* commit '680959b0914cc32a4f30dbef2fcc95dd980dd96b':
  Add missing data initialization

9 years agoAdd missing data initialization
Pavlin Radoslavov [Thu, 9 Jul 2015 06:17:44 +0000 (23:17 -0700)]
Add missing data initialization

A local struct variable is not initialized (memset to 0)
when sending GET_REPORT_EVT to an application.
As a result, field hs_data.rsp_data.p_rpt_data might be used
uninitialized.

Bug: 22352578
Change-Id: I72141117187c392bc0502a17bf71859e67c8da54

9 years agoam 49120dc8: build: Fix LOG_TAG define breakage, macro usage
Marie Janssen [Wed, 8 Jul 2015 01:42:18 +0000 (01:42 +0000)]
am 49120dc8: build: Fix LOG_TAG define breakage, macro usage

* commit '49120dc867c7818511b5afec461dfc97d17eef58':
  build: Fix LOG_TAG define breakage, macro usage

9 years agobuild: Fix LOG_TAG define breakage, macro usage
Marie Janssen [Tue, 7 Jul 2015 23:47:20 +0000 (16:47 -0700)]
build: Fix LOG_TAG define breakage, macro usage

Fixes build breakages related to r.android.com/156982

Change-Id: Ib1143c41fe05a17c296226998afdb41a8cb6294a

9 years agoam db554581: build: Update osi log functions, use consistently
Marie Janssen [Tue, 7 Jul 2015 18:56:36 +0000 (18:56 +0000)]
am db554581: build: Update osi log functions, use consistently

* commit 'db554581079863974af8e1289646f5deea6fc044':
  build: Update osi log functions, use consistently

9 years agoam fd0e9f19: Properly handle outgoing connection requests in opening/opened state
Anubhav Gupta [Tue, 7 Jul 2015 17:34:52 +0000 (17:34 +0000)]
am fd0e9f19: Properly handle outgoing connection requests in opening/opened state

* commit 'fd0e9f1915dab624282c9d11ac6a1c7228c18c75':
  Properly handle outgoing connection requests in opening/opened state

9 years agoam 905c72de: Incorrect address type in ADV end on reconnection
Satya Calloji [Tue, 7 Jul 2015 17:34:51 +0000 (17:34 +0000)]
am 905c72de: Incorrect address type in ADV end on reconnection

* commit '905c72de29add7963b48e016b87e5ebe1a5f8503':
  Incorrect address type in ADV end on reconnection

9 years agoam 9c5d0727: Override remote suspend flag on local play state changes
Anubhav Gupta [Tue, 7 Jul 2015 17:34:50 +0000 (17:34 +0000)]
am 9c5d0727: Override remote suspend flag on local play state changes

* commit '9c5d0727dd4cd09e44c032506c28ab4120ad3b88':
  Override remote suspend flag on local play state changes

9 years agoam 42f37840: SDP: Validate input UUID\'s length
Srinu Jella [Tue, 7 Jul 2015 17:34:49 +0000 (17:34 +0000)]
am 42f37840: SDP: Validate input UUID\'s length

* commit '42f37840a891eddfee0943fbdf84c2e4f0d765c5':
  SDP: Validate input UUID's length

9 years agoam 97269982: Remove extraneous patch from secure connections workaround
Andre Eisenbach [Tue, 7 Jul 2015 17:34:48 +0000 (17:34 +0000)]
am 97269982: Remove extraneous patch from secure connections workaround

* commit '97269982095f2da252d667542688d98e5fee128f':
  Remove extraneous patch from secure connections workaround

9 years agoam f1029c7a: Remove stored link key for temporarily paired devices
Srinu Jella [Tue, 7 Jul 2015 17:34:47 +0000 (17:34 +0000)]
am f1029c7a: Remove stored link key for temporarily paired devices

* commit 'f1029c7afb9b4c9fcf95b3f98ce9c68b10d5a02c':
  Remove stored link key for temporarily paired devices

9 years agoProperly handle outgoing connection requests in opening/opened state
Anubhav Gupta [Wed, 4 Sep 2013 10:20:39 +0000 (15:50 +0530)]
Properly handle outgoing connection requests in opening/opened state

This happens in race conditions when we try to connect to a remote
A2DP device from Bluetooth Settings UI and simultaneously there is incoming
connection request from previously connected remote. This fix addresses
the scenario where because of first A2DP connection btif moves to opening/
opened state and then the second connect request is received.
This scenario is handled by gracefully rejecting the second connect request
from btif layer if it is already connected or about to be connected by the
first connect request.

Bug: 22028876
Change-Id: I53be400d1d7c9a84ca9d9a75b6b6f010975cf0cf

9 years agoIncorrect address type in ADV end on reconnection
Satya Calloji [Tue, 23 Jun 2015 22:21:19 +0000 (15:21 -0700)]
Incorrect address type in ADV end on reconnection

Handled the issue of incorrect address type and value
(on Privacy 1.1 chipsets) on reconnection by setting
the correct device type and address value on advertiser end

Original author: Chaojing Sun <cjsun@broadcom.com>

Bug: 22100659
Change-Id: I009888cc9ebd0b631543027d6e34b6c7ecbd0ce8

9 years agoOverride remote suspend flag on local play state changes
Anubhav Gupta [Sat, 27 Jul 2013 09:16:29 +0000 (14:46 +0530)]
Override remote suspend flag on local play state changes

- Remote device may initiate AVDTP Suspend within 3s of AVRCP pause,
  which sets remote suspend flag. Later on resumption of local playback
  A2DP packets can not be processed further as Remote suspend flag
  remains set. current change overrides remote suspend flag if local
  suspend is triggered later.
- This change covers the usecase where play is pressed from DUT UI
  before local suspend triggers in such scenarios current change takes
  care of resetitng remote suspend flag on AVRCP play state change event.
- Moreover this change will drop A2DP packets when the setparameter
  is called with A2dpSuspended=true and resumes when the mentioned parameter
  is reset.

This change along with corresponding app change helps mitigating
issues reported due to A2Dp, HFP synchronizations and local and remote
device initiated AVDTP suspend handling.

Bug: 22028876
Change-Id:  I3bb334373414170254744d9233cbd2e66219bfa0

9 years agoSDP: Validate input UUID's length
Srinu Jella [Thu, 24 Jul 2014 14:24:32 +0000 (19:54 +0530)]
SDP: Validate input UUID's length

Use case: Crash observed during BT IOT testing

1. Try to pair to the remote device.
2. Connect  to the remote device's audio profiles.
3. Remote device has given the wrong UUID's length.This will leads to crash.

Failure: crash observed during profile connection

Root cause: Remote sent invalid UUID length,which is causing crash
in comparison logic.

Fix: Validate input UUID's length before going for actual comparison.

Bug: 19417758
Change-Id: I8216d17e3f6cc22dfbeca4b31972b5b5584a73ea

9 years agoRemove extraneous patch from secure connections workaround
Andre Eisenbach [Tue, 7 Jul 2015 05:27:00 +0000 (22:27 -0700)]
Remove extraneous patch from secure connections workaround

Bug: 21817410
Change-Id: I55b3753b0ae9f389f1531bb588c4868e96842aeb

9 years agoRemove stored link key for temporarily paired devices
Srinu Jella [Tue, 2 Sep 2014 10:12:11 +0000 (15:42 +0530)]
Remove stored link key for temporarily paired devices

Problem: Device shows up in paired list during just work pairing

1. Create a connection from DUT to remote.
2. Remove the link key in remote.
3. Send a file from remote to DUT.
4. Turn OFF BT. Turn ON.

Failure: Device should not move to paired list after BT on/off
as device removed from UI during just work pairing

Root cause: remote device is not removed from btif but
its removed from UI during justworks pairing

Fix: remote device is removed from btif during justworks
pairing to sync up UI and btif paired list

Bug: 19417758
Change-Id: I73de0a94c4f7ada644d258790a9e3e4bf11fc4e5

9 years agoam 1192df9f: Save all snoop logs when BtSnoopSaveLog=true
Tucker Sylvestro [Tue, 7 Jul 2015 01:23:07 +0000 (01:23 +0000)]
am 1192df9f: Save all snoop logs when BtSnoopSaveLog=true

* commit '1192df9f7e709b9d9508ac86cbf5099a3a7ffa0e':
  Save all snoop logs when BtSnoopSaveLog=true

9 years agoSave all snoop logs when BtSnoopSaveLog=true
Tucker Sylvestro [Mon, 6 Jul 2015 23:29:06 +0000 (19:29 -0400)]
Save all snoop logs when BtSnoopSaveLog=true

Previously, only the last snoop log was saved, which was often not
enough if the bluetooth stack was in a crash loop or an app was
resetting it frequently.

Bug: 22202788
Change-Id: I74622ceabe9ce12d5ba03c640c37f697d5a5bb01

9 years agoam 7927f68b: Blacklist Nexus Remote for LE secure connections
Andre Eisenbach [Mon, 6 Jul 2015 23:43:51 +0000 (23:43 +0000)]
am 7927f68b: Blacklist Nexus Remote for LE secure connections

* commit '7927f68bb2d9b963288261e1e858463b43c52a2d':
  Blacklist Nexus Remote for LE secure connections

9 years agoam 4f6c9b4f: Use correct transport type while encrypting link
Nitin Arora [Mon, 6 Jul 2015 23:43:50 +0000 (23:43 +0000)]
am 4f6c9b4f: Use correct transport type while encrypting link

* commit '4f6c9b4f68d152baf7aa029cbe9b570994584101':
  Use correct transport type while encrypting link

9 years agobuild: Update osi log functions, use consistently
Marie Janssen [Fri, 26 Jun 2015 21:53:46 +0000 (14:53 -0700)]
build: Update osi log functions, use consistently

Update the LOG_* functions to take a tag argument which makes them more
consistent with the Android Log.*(TAG, s) common syntax and removes
some #define-dependency with osi/include/log.h.

Also update to never use Android log functions directly.

Also contains minor cleanup of some header includes.

Bug: 21569831
Change-Id: If07385cafbea062232ecdbc7c673f908d5ef8921

9 years agoBlacklist Nexus Remote for LE secure connections
Andre Eisenbach [Thu, 2 Jul 2015 23:14:28 +0000 (16:14 -0700)]
Blacklist Nexus Remote for LE secure connections

The Nexus remote will disconnect during encryption when paired with the
secure connections feature enabled. This patch will blacklist the remote
and mask out the feature during pairing.

This patch introduces a new interop database with the aim of
consolodating various blacklists and interop workarounds into a single
database for code readability and maintainability of the list.

Bug: 21817410
Change-Id: I6f510e1c8c6050ab4e313209122d028e12e5f54f

9 years agoam d69bef4e: Merge "Prevent LE remote name request during inquiry" into mnc-dev
Andre Eisenbach [Mon, 6 Jul 2015 19:18:50 +0000 (19:18 +0000)]
am d69bef4e: Merge "Prevent LE remote name request during inquiry" into mnc-dev

* commit 'd69bef4e26accb3ed85db244c442a4e028927ea8':
  Prevent LE remote name request during inquiry

9 years agoUse correct transport type while encrypting link
Nitin Arora [Tue, 9 Jun 2015 22:30:18 +0000 (15:30 -0700)]
Use correct transport type while encrypting link

This patch uses the transport type from the GATT event instead
of using the device type stored in NVRAM, to determine the
transport type while encrypting the link. The issue is seen
with dual mode devices, when the connection on LE transport
causes encryption request on the BR/EDR transport

Bug: 21652097
Change-Id: I895756f9c0048b5a559ea00f633b1100109e52b8

9 years agoam 8e928b4a: Set random identity only if enhanced privacy is supported
Priti Aghera [Mon, 6 Jul 2015 16:47:37 +0000 (16:47 +0000)]
am 8e928b4a: Set random identity only if enhanced privacy is supported

* commit '8e928b4ad152c6b2713147067e02327f3bbedde6':
  Set random identity only if enhanced privacy is supported

9 years agoMerge "Prevent LE remote name request during inquiry" into mnc-dev
Andre Eisenbach [Mon, 6 Jul 2015 16:45:30 +0000 (16:45 +0000)]
Merge "Prevent LE remote name request during inquiry" into mnc-dev

9 years agoPrevent LE remote name request during inquiry
Nitin Arora [Fri, 11 Jul 2014 21:33:05 +0000 (14:33 -0700)]
Prevent LE remote name request during inquiry

This change prevents the LE RNR at the end of inquiry. This prevents
extra LE connections created during BT scan, to fetch remote name,
which will be performed later during connections.

Bug: 22228981
Change-Id: Ied61bc192cec611e7b2f41e474c5f032ed9f0981

9 years agoSet random identity only if enhanced privacy is supported
Priti Aghera [Wed, 1 Jul 2015 20:27:57 +0000 (13:27 -0700)]
Set random identity only if enhanced privacy is supported

Change Own address type to Random identity only if controller supports enhanced
privacy. Check if controller supports enhanced privacy before changing own adress type
and peer address type to 0x02 or 0x03 in auto connection.
Privacy 4.1 only supports Public and Random address.

Bug: 20817308
Change-Id: I9f5531e4e41c824426cd64de517b44355ac2655d

9 years agoam 9345c8fd: Use the correct memory free function within HCI layer shutdown
Pavlin Radoslavov [Thu, 2 Jul 2015 00:46:54 +0000 (00:46 +0000)]
am 9345c8fd: Use the correct memory free function within HCI layer shutdown

* commit '9345c8fd0dae6d1c1954c9d2e29ad57fcf5015ad':
  Use the correct memory free function within HCI layer shutdown

9 years agoUse the correct memory free function within HCI layer shutdown
Pavlin Radoslavov [Wed, 1 Jul 2015 04:39:11 +0000 (21:39 -0700)]
Use the correct memory free function within HCI layer shutdown

The  entries on the "command_queue" are allocated by osi_calloc()
hence they should be deallocated by osi_free()

Bug: 21784321
Change-Id: Ic6e13dbafef2c6ac79ce74ebfc4db702c9ef04c5

9 years agoam df81c3aa: Add missing library dependency.
Evgenii Stepanov [Tue, 30 Jun 2015 01:53:30 +0000 (01:53 +0000)]
am df81c3aa: Add missing library dependency.

* commit 'df81c3aaadee7a5f91e5d993cc823d4e65db25db':
  Add missing library dependency.

9 years agoAdd missing library dependency.
Evgenii Stepanov [Mon, 29 Jun 2015 20:59:44 +0000 (13:59 -0700)]
Add missing library dependency.

Fixes the following link error in SANITIZE_TARGET=address build for
hammerhead:
system/bt/audio_a2dp_hw/audio_a2dp_hw.c:208: error: undefined reference
to 'osi_socket_local_client_connect'

Bug: 21785137
Change-Id: Ie29a2772e7f1a4f697d895eb29b01d39d6f9c651

9 years agoam fa3c1214: Fix possible null-pointer de-reference in bta_gattc_util
Andre Eisenbach [Sun, 28 Jun 2015 17:30:12 +0000 (17:30 +0000)]
am fa3c1214: Fix possible null-pointer de-reference in bta_gattc_util

* commit 'fa3c1214f5b006edced961a66c758b8b47b0f482':
  Fix possible null-pointer de-reference in bta_gattc_util

9 years agoFix possible null-pointer de-reference in bta_gattc_util
Andre Eisenbach [Sat, 27 Jun 2015 05:30:33 +0000 (22:30 -0700)]
Fix possible null-pointer de-reference in bta_gattc_util

Bug: 21756298
Change-Id: I4bd38f6fa594ccb4dd9f23f3887484743a3bc451

9 years agoam 3a2fa83d: Copy an AVRC packet before sending a response back
Pavlin Radoslavov [Sat, 27 Jun 2015 03:22:35 +0000 (03:22 +0000)]
am 3a2fa83d: Copy an AVRC packet before sending a response back

* commit '3a2fa83dac1b07b661a20e2412aad9bf81492106':
  Copy an AVRC packet before sending a response back

9 years agoCopy an AVRC packet before sending a response back
Pavlin Radoslavov [Fri, 26 Jun 2015 21:44:12 +0000 (14:44 -0700)]
Copy an AVRC packet before sending a response back

Don't reuse AVRC buffers for responding back. Apparently,
in the AVRC packets we transmit the offset with the payload must
be at least 15 octets. If the original buffer is not large enough,
this results in memory corruption.

Also, use an explicit check for 'bt_rc_ctrl_callbacks' as a workaround
until the upper layer does the right thing with the callbacks registration.

Bug: 22006014

Change-Id: I28c248d1580bdddbda76298d19faadf8985187fc

9 years agoam dd2021c6: Always ACK indications in the event of an error
Tucker Sylvestro [Thu, 25 Jun 2015 21:26:52 +0000 (21:26 +0000)]
am dd2021c6: Always ACK indications in the event of an error

* commit 'dd2021c65b8a1a14e67e4f23628b3e15faf9fdcc':
  Always ACK indications in the event of an error

9 years agoAlways ACK indications in the event of an error
Tucker Sylvestro [Thu, 18 Jun 2015 22:14:25 +0000 (18:14 -0400)]
Always ACK indications in the event of an error

This works around a race condition in which the just-connected remote
device sends the local device an indication before the appropriate
handle/device/etc. has been added to the cache.  Previously we were
dropping that indication, which led to the remote device timing out
and disconnecting some time after the connection had been successfully
established.

Bug: 21026847

Change-Id: Iea43e7c93e48b5e7a7e78a1c3fb591d6fe972fc3

9 years agoam d9663b2d: Set idle timeout to zero when removing fixed channel
Pradeep Panigrahi [Thu, 25 Jun 2015 17:42:19 +0000 (17:42 +0000)]
am d9663b2d: Set idle timeout to zero when removing fixed channel

* commit 'd9663b2d7ab5457cb9ab6fe39dcadb191e8f1012':
  Set idle timeout to zero when removing fixed channel

9 years agoam 8bc9ca59: Resolved incorrect AV startup sequence
Avish Shah [Thu, 25 Jun 2015 17:21:49 +0000 (17:21 +0000)]
am 8bc9ca59: Resolved incorrect AV startup sequence

* commit '8bc9ca592a1c80d50f85b4dafba24ba2394b4ab7':
  Resolved incorrect AV startup sequence

9 years agoSet idle timeout to zero when removing fixed channel
Pradeep Panigrahi [Tue, 16 Jun 2015 04:32:50 +0000 (10:02 +0530)]
Set idle timeout to zero when removing fixed channel

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

9 years agoResolved incorrect AV startup sequence
Avish Shah [Thu, 25 Jun 2015 12:31:33 +0000 (18:01 +0530)]
Resolved incorrect AV startup sequence

Issue:
-> In AV start-up sequence, State machine initialization was being
called after enabling Btif A2dp service.
-> In that case, State machine handle will be empty and it will
prevent enable and register events to enter into BTIF.
-> Because of the absence of enable/register events, AV module in
stack will be unaware of upper layer registration and will not
proceed for connection.

Fix:
-> Changed the sequence in AV start-up, initialized State machine
first before dispatching any events to State machine.
-> So, the handle will not be empty and will not block events like
BTA_AV_ENABLE_EVT and BTA_AV_REGISTER_EVT to enter into BTIF.

Bug: 21451237
Change-Id: I5d47e20ed68ea5730a7c149c316446eb8a1d41af

9 years agoam 10969128: build: Eliminate cutils/sockets dependencies from system/bt
Miao Chou [Thu, 25 Jun 2015 01:12:36 +0000 (01:12 +0000)]
am 10969128: build: Eliminate cutils/sockets dependencies from system/bt

* commit '109691281c0135fd4298debcdec37fdc5855261e':
  build: Eliminate cutils/sockets dependencies from system/bt

9 years agobuild: Eliminate cutils/sockets dependencies from system/bt
Miao Chou [Wed, 10 Jun 2015 00:39:46 +0000 (17:39 -0700)]
build: Eliminate cutils/sockets dependencies from system/bt

Eliminate cutils/sockets dependencies by pulling sources files from
core/libcutils into osi/.
   - Pulled source files from cutils/ into osi/ and modified GN files and
     Android.mk
   - Updated includes to use the headers in osi/ and removed unused/duplicated
     headers.
   - Renamed the functions of osi/sockets and updated wherever they are called
     to avoid usign symbols from cutils/sockets, since other cutils
     dependencies have not been eliminated yet.

Bug: 21667795
Change-Id: I3dd4371d585f120d97ac0433ab1f35edb820dbb9

9 years agoam 641e21a5: HOGP: Clear allocated memory for unmatched HID reports
Subramanian Srinivasan [Wed, 24 Jun 2015 01:00:12 +0000 (01:00 +0000)]
am 641e21a5: HOGP: Clear allocated memory for unmatched HID reports

* commit '641e21a5389dd3765364f52a15a4a302a99fa360':
  HOGP: Clear allocated memory for unmatched HID reports

9 years agoHOGP: Clear allocated memory for unmatched HID reports
Subramanian Srinivasan [Thu, 12 Feb 2015 00:55:12 +0000 (16:55 -0800)]
HOGP: Clear allocated memory for unmatched HID reports

Prevents GKI Exception in BT stack when phone enters suspended state
after performing HOGP device connection by clearing the allocated
memory when write to an unmatched report is done.

Bug: 22028876
Change-Id: Ia6ca9405142410e894c7ebe84d8827ffdc7659ba

9 years agoam ea8292ea: SMP state machine fix for passkey entry
Nitin Arora [Wed, 24 Jun 2015 00:12:50 +0000 (00:12 +0000)]
am ea8292ea: SMP state machine fix for passkey entry

* commit 'ea8292eab91f90c7f917252d27aeab2f5a2393e0':
  SMP state machine fix for passkey entry

9 years agoam 11e6c293: Configure Bluetooth Low Energy scan parameters correctly
Nitin Arora [Wed, 24 Jun 2015 00:12:49 +0000 (00:12 +0000)]
am 11e6c293: Configure Bluetooth Low Energy scan parameters correctly

* commit '11e6c2939f63398e86757d08eac32ef1d4f89fdf':
  Configure Bluetooth Low Energy scan parameters correctly

9 years agoam 483847a3: Incorrect address type in LE connected event
Satya Calloji [Wed, 24 Jun 2015 00:04:30 +0000 (00:04 +0000)]
am 483847a3: Incorrect address type in LE connected event

* commit '483847a3d46e5a1f3c15c69b8344fb1f20b9972f':
  Incorrect address type in LE connected event

9 years agoSMP state machine fix for passkey entry
Nitin Arora [Mon, 1 Jun 2015 12:24:10 +0000 (05:24 -0700)]
SMP state machine fix for passkey entry

The SMP slave state machine goes on to generate local nonce
after a successful commit, and ignores any commit from the
remote master if received during the generation process.
This change fixes that race condition

Bug: 21896912
Change-Id: I0cc2f1d20f6754d19f8b39fd62e3176007c50f1b

9 years agoConfigure Bluetooth Low Energy scan parameters correctly
Nitin Arora [Tue, 30 Sep 2014 01:43:27 +0000 (18:43 -0700)]
Configure Bluetooth Low Energy scan parameters correctly

This patch ensures that Bluetooth Inquiry uses the low latency
scan parameters, and the scan params set by the Apps for LE scan
are retained and set at the end of a BT inquiry.

Bug: 21896912
Change-Id: Iaf9e47330393cc1e0c21c625e8e07ce933506983

9 years agoIncorrect address type in LE connected event
Satya Calloji [Fri, 19 Jun 2015 17:46:03 +0000 (10:46 -0700)]
Incorrect address type in LE connected event

Enable address resolution to resolve the incoming connection details
to provide the correct address type as part of the LE connection
event.

Bug: 21751039
Change-Id: I148b0ffbfa1a39a32d90f5607362754d1901203f

9 years agoam c5c74107: Set the security mode to secure connections only mode
Srinu Jella [Tue, 23 Jun 2015 23:09:12 +0000 (23:09 +0000)]
am c5c74107: Set the security mode to secure connections only mode

* commit 'c5c741075fbc36e373f0bec4c3520188d2ba9a38':
  Set the security mode to secure connections only mode

9 years agoam f88e742e: Correct the logic of UIPC thread id check
Srinu Jella [Tue, 23 Jun 2015 23:09:12 +0000 (23:09 +0000)]
am f88e742e: Correct the logic of UIPC thread id check

* commit 'f88e742ea5f95a529a1758cb00aea0e58fdb9863':
  Correct the logic of UIPC thread id check

9 years agoSet the security mode to secure connections only mode
Srinu Jella [Fri, 19 Jun 2015 12:20:40 +0000 (17:50 +0530)]
Set the security mode to secure connections only mode

Use case: Test the secure connections only mode PTS test cases.

Test Steps:
1. Call the API BTM_SetSecureConnectionsOnly from BT-IF layer to
   put the DUT is under secure connections only mode to execute
   the PTS test case TP/SEC/SEM/BV-11-C.
2. Run the required steps for PTS test case.

Failure: Failed to enter into secure connections only mode.

Root Cause: The function BTM_SetSecureConnectionsOnly doesn't set
btm layer security mode variable to only mode and all further checks
are based on that variable.

Fix: Fixed it by setting the security mode variable properly
in the API function.

Bug: 21896912
Change-Id: I21d37e7d24c443c2cbcd72d6f62f5e31fa7cf107

9 years agoCorrect the logic of UIPC thread id check
Srinu Jella [Tue, 12 May 2015 14:48:43 +0000 (20:18 +0530)]
Correct the logic of UIPC thread id check

Use case:   Check the A2dp play , pause from headset

STR:
Connect to the headset from DUT
Try play , pause from Headset once the song is started playing from headset.

Failure: Bluetooth process crashed due to invalid fd descriptor while
clearing fds using FD_CLR

Root cause: Root cause for this issue is pthread join mechanism for
UIPC thread is not proper ( incorrect logic ), as a result UIPC thread
still running, and A2DP media task will try to start a new UIPC thread
before the previous UIPC read thread is closed, finally sometimes
this scenario leads to this issue. This issue doesn't come always,
if the media task is in process of initiating the fds before staring
the new UIPC thread, and previous UIPC thread is in exiting state.

Fix: Correct the logic of UIPC thread id check while joining the UIPC thread.
Thread id might hold pointer value where it's value is negative vaule with
singed bit is set,so corrected the logic to check against zero or  non zero.

Bug: 21896912
Change-Id: I1307d848958656e718e95a972f258526470b1974

9 years agoam bf3e67e7: Reset the pairing state on pairing failure
Srinu Jella [Tue, 23 Jun 2015 22:43:40 +0000 (22:43 +0000)]
am bf3e67e7: Reset the pairing state on pairing failure

* commit 'bf3e67e76aa2e7eced6b28669f10b599c08ab931':
  Reset the pairing state on pairing failure

9 years agoam ca7e0b1b: Handle connection request to already connected device.
Srinu Jella [Tue, 23 Jun 2015 22:33:10 +0000 (22:33 +0000)]
am ca7e0b1b: Handle connection request to already connected device.

* commit 'ca7e0b1bd428ffa60cc8e49514421be94151f828':
  Handle connection request to already connected device.

9 years agoReset the pairing state on pairing failure
Srinu Jella [Mon, 13 Oct 2014 12:36:01 +0000 (18:06 +0530)]
Reset the pairing state on pairing failure

Use case: Test the paring scenario with remote device with security mode 3.

STR:
1. Create a connection from Remove dev with Security Mode-3 to DUT.
2. Enter pin key in remote, when pin key pop-up comes in DUT, reject the same.
3. Try to create connection from DUT to Remote dev-2, within 30 seconds.

Failure: Create connection not sent from DUT to remote, even though
there was no pairing taking place

Root cause: As the pairing state is not reset properly it disturbs
the next pairing process.

Reproducible using MecApp test application.

Fix: Reset the pairing state to idle in case stored paring
device matches with the device for which the pairing
failure happened.

Bug: 21896912
Change-Id: I0a9e143a44bb2ae7e296d7d76c1323e517f9cc42

9 years agoHandle connection request to already connected device.
Srinu Jella [Wed, 15 Oct 2014 11:10:02 +0000 (16:40 +0530)]
Handle connection request to already connected device.

Use case: Test the connect collision scenario from DUT and Headset.

STR:
1. Create a connection from DUT to headset, disconnect and unpair the link.
2. Turn OFF and turn ON headset, keep in pairing mode, headset keeps trying
   to connect back to DUT.
3. Inquiry in DUT, and connect to headset.

Failure: DUT gets stuck in pairing, whenever there is a clash in
accept_connection and create_connection.

Root cause: When DUT and remote try to connect to each other simultaneously,
an ACL handle is created with first connect request and the second connect
request is also processed.DUT doesn't check whether there is already a
ACL handle present between the devices.

Fix: Fixed the issue by reusing the existing handle and
discarding the second connect request.

Bug: 21896912
Change-Id: I2001bc3b2fa50f827a4e3b41cde91af1ea106c54

9 years agoam c0532307: Allocated requested buffer size in SDP attribute request
Srinu Jella [Tue, 23 Jun 2015 21:50:15 +0000 (21:50 +0000)]
am c0532307: Allocated requested buffer size in SDP attribute request

* commit 'c0532307d35ac86f5427243809f2c98b4fd8cacd':
  Allocated requested buffer size in SDP attribute request

9 years agoam a3dbe938: NULL pointer check in sdpu_build_attrib_entry
Srinu Jella [Tue, 23 Jun 2015 21:50:15 +0000 (21:50 +0000)]
am a3dbe938: NULL pointer check in sdpu_build_attrib_entry

* commit 'a3dbe938e519dfbdbfd121b8d7a8473cccfd3e70':
  NULL pointer check in sdpu_build_attrib_entry

9 years agoAllocated requested buffer size in SDP attribute request
Srinu Jella [Mon, 22 Dec 2014 14:16:28 +0000 (19:46 +0530)]
Allocated requested buffer size in SDP attribute request

Use case: Allocated required GKI buf in sdp attr req

1. Enter UUID - 0100 for L2CAP or 110C for AVRCP Target so DUT sends
   continuation frame for TSPX_sdp_service_search_pattern on PTS
2. Start Test case TP/SSA/BV-06 in PTSv6.0

Failure: Some PTS test cases request less attributes in first packet
and request more attributes in continuation packets.
As stack allocates the buf in start packet and using the same
buf in continuation packets, it's causing buffer corruption and crash

Root cause: Buffer allocated for start packet is not sufficient
in continuation packets

Fix: Fixing this issue by dynamically allocating buffer in continuation
packets of service_search_attr_req and service_attr_req

Bug: 21896912
Change-Id: I8daeffb7d6486c7b916ad2f0505ad422d91a613c

9 years agoNULL pointer check in sdpu_build_attrib_entry
Srinu Jella [Wed, 18 Jun 2014 15:45:55 +0000 (21:15 +0530)]
NULL pointer check in sdpu_build_attrib_entry

Use case: NULL pointer check in sdpu_build_attrib_entry

Crash observed during BT stability test

Failure: Crash observed while accessing p_attr->value_ptr

Root cause: There is no null check for p_attr->value_ptr while
accessing it in sdpu_build_attrib_entry

Fix: Fixing this issue by adding null check for p_attr->value_ptr
while accessing it in sdpu_build_attrib_entry

Bug: 21896912
Change-Id: I1dd352a33ff6f86add7d1b1bfdf240d1b7992b83

9 years agoam 0bcf0c6e: HID: Allow reconnection from Host on paired HID Devices.
Hemant Gupta [Tue, 23 Jun 2015 21:07:25 +0000 (21:07 +0000)]
am 0bcf0c6e: HID: Allow reconnection from Host on paired HID Devices.

* commit '0bcf0c6e6b5b09b9bc7f856f739e57321120f67b':
  HID: Allow reconnection from Host on paired HID Devices.

9 years agoam eeb249bd: PAN: Fix to avoid buffer corruption while rebuilding the Bnep header
Nitin Shivpure [Tue, 23 Jun 2015 21:06:30 +0000 (21:06 +0000)]
am eeb249bd: PAN: Fix to avoid buffer corruption while rebuilding the Bnep header

* commit 'eeb249bd2844a14a5b6914f99bad99a38f165caf':
  PAN: Fix to avoid buffer corruption while rebuilding the Bnep header

9 years agoHID: Allow reconnection from Host on paired HID Devices.
Hemant Gupta [Mon, 4 Aug 2014 12:37:41 +0000 (18:07 +0530)]
HID: Allow reconnection from Host on paired HID Devices.

Host can send connection request when paired HID device
is in disconnected state. We are not checking the
NORMALLY_CONNECTABLE flags from sdp record, and by default
sending this request from host, for subsequent user initiated
connection to paired remote HID Devices.
If the remote HID is in page scan mode, it will get connected
and if not, connection will fail after retrying until
HID_HOST_MAX_CONN_RETRY times.

Without this patch, if remote hid device sdp record shows that
device's NORMALLY_CONNECTABLE flag is false, host will not be
able to create outgoing connection to remote device even if the
device is in pairing mode until device is unpaired giving bad
user experience.

Bug: 22028876
Change-Id: I2b3c5c25dc7b08ab6ed0c3667897e5ea0f05f914

9 years agoPAN: Fix to avoid buffer corruption while rebuilding the Bnep header
Nitin Shivpure [Tue, 15 Jul 2014 12:30:21 +0000 (18:00 +0530)]
PAN: Fix to avoid buffer corruption while rebuilding the Bnep header

A case, where 3 remote device (PANU role) is connected with DUT (NAP role).
the one remote (PANU role) send BNEP_COMPRESSED_ETHERNET_DEST_ONLY
packet to DUT (NAP role), which is for another remote device (PANU role).
So DUT (NAP role) forwards this packet to another remote device (PANU role).
As same pbuf is used across the L2CAP/BNEP/PAN layer since reception from
L2CAP to writing on L2CAP CID of another PANU. Sometimes buffer (p_buf) gets
corrupted, when required buffer size is greater than actual buffer size,
while rebuilding the Bnep header.

Using bnep_write instead of bnep_writeBuf to solve the buffer corruption
issue, which allocates the new buffer & append data into it.

This patch also add TRC_BNEP & TRC_PAN into conf file.

Bug: 22028876
Change-Id: I125cab6d3da0f8126605bc7e9f764a27ee72fb1f

9 years agoam f799a869: Proper construction of AVDTP general reject message
Anubhav Gupta [Tue, 23 Jun 2015 18:08:17 +0000 (18:08 +0000)]
am f799a869: Proper construction of AVDTP general reject message

* commit 'f799a869d9e9d656764b1550fb0162276d772739':
  Proper construction of AVDTP general reject message

9 years agoam 8795a9a1: Delay A2DP HAL out stream open process
Anubhav Gupta [Tue, 23 Jun 2015 18:08:04 +0000 (18:08 +0000)]
am 8795a9a1: Delay A2DP HAL out stream open process

* commit '8795a9a1789c4b32b7a2b99c7c09b4fb4ba3775d':
  Delay A2DP HAL out stream open process

9 years agoam a0124571: Suspend AVDTP link in remote initiated AVDTP Start
Anubhav Gupta [Tue, 23 Jun 2015 18:07:57 +0000 (18:07 +0000)]
am a0124571: Suspend AVDTP link in remote initiated AVDTP Start

* commit 'a0124571e3d5455448dbfcea7617f583b20210f9':
  Suspend AVDTP link in remote initiated AVDTP Start

9 years agoam 96162b60: A2DP: Use mutex to only to check and set HAL state
Anubhav Gupta [Tue, 23 Jun 2015 18:07:56 +0000 (18:07 +0000)]
am 96162b60: A2DP: Use mutex to only to check and set HAL state

* commit '96162b608ce2ad6d86214d7efd2bcc120d1f079c':
  A2DP: Use mutex to only to check and set HAL state

9 years agoProper construction of AVDTP general reject message
Anubhav Gupta [Wed, 12 Nov 2014 14:25:00 +0000 (19:55 +0530)]
Proper construction of AVDTP general reject message

Build AVDTP general reject message as per AVDTP Specification.
Resolves issue with PTS AVDTP case TP/SIG/SMG/BI-28.

Bug: 21896912
Change-Id: I10e729f099898096f666081f5e5cd8e4a9dc3ae7

9 years agoDelay A2DP HAL out stream open process
Anubhav Gupta [Mon, 14 Apr 2014 08:59:25 +0000 (14:29 +0530)]
Delay A2DP HAL out stream open process

Delay A2DP HAL out stream open process to ensure that the
Headset is in proper state when START is initiated from DUT
immediately after the connection due to ongoing music playback.
Jawbone speaker goes to bad state unless it gets enough time
between AVDTP OPEN and START.

Bug: 22028876
Change-Id: I79a895a85ac7d37208192acf9064fd5c979dd28b

9 years agoSuspend AVDTP link in remote initiated AVDTP Start
Anubhav Gupta [Mon, 12 Aug 2013 20:07:22 +0000 (01:37 +0530)]
Suspend AVDTP link in remote initiated AVDTP Start

As media player is not started as part of remote initiated
AVDTP start, hence if link is kept in Started state when
remote initiated START is received it unncessarily blocks
power manager to trigger sniff on that link which increases
power number.
Related issue is seen with Moto HS820, Denso08.
These peer devices send AVDTP start on AVDTP connect and
does not suspend causing link not to go to sniff.
This change takes care of sending suspend in such scenarios
DUT initiated start gets triggered when local playback starts.
Moreover this change helps in suspending streaming if remote
initiates avdtp start during an ongoing call. This helps
remote and DUT's a2dp state to be in sync.

Bug: 22028876
Change-Id: I8ebee009c95148cf733e39d897bc8ffe5af7791e

9 years agoA2DP: Use mutex to only to check and set HAL state
Anubhav Gupta [Thu, 4 Jun 2015 11:24:37 +0000 (16:54 +0530)]
A2DP: Use mutex to only to check and set HAL state

In multi-threaded env A2DP state gets updated to suspended
after checking and before acquiring mutex lock. A2DP State
should be checked inside mutex lock to avoid checking against
inconsistent state.
Moreover this change prevents overwriting of state
from AUDIO_A2DP_STATE_SUSPENDED to AUDIO_A2DP_STATE_STOPPED
which would start the data path when there is data inflow
from audio in suspended state, which is not intended.
This change helps avoiding above wrong actions.

Bug: 22028876
Change-Id: I4fb73c1a6851fa97d539860d5fc0b8022b019bc1