OSDN Git Service

android-x86/system-bt.git
9 years agoHandle pairing timeout during remote name request
Srinu Jella [Wed, 8 Oct 2014 11:06:43 +0000 (16:36 +0530)]
Handle pairing timeout during remote name request

If a remote name request is in progress and a pairing timeout is
triggered, the host needs to post the bond failure to the UI and
needs to reset the pairing cb state, otherwise the UI will be stuck
in pairing mode and scanning won't work until Bluetooth is cycled
OFF->ON.

Change-Id: I76d9a83b1db7236db51617da998b5857b0de39f0

9 years agoReduce GATT log verbosity
Andre Eisenbach [Thu, 28 May 2015 18:16:52 +0000 (11:16 -0700)]
Reduce GATT log verbosity

Change-Id: I55e6ec1afdd8a13f4401809ef89ef2d80efb7f66

9 years agoAvoid null pointer exception for invalid L2CAP channels
Srinu Jella [Fri, 30 May 2014 15:45:01 +0000 (21:15 +0530)]
Avoid null pointer exception for invalid L2CAP channels

Change-Id: I8ac40e9cfe6dd015f40c6f493727e123a0d247e6

9 years agoAdd missing clean_up step for the OSI module.
Pavlin Radoslavov [Sat, 23 May 2015 02:47:49 +0000 (19:47 -0700)]
Add missing clean_up step for the OSI module.

Now the OSI module's shut_down processing is split into "shut_down"
and "clean_up".

Previously, there was an ordering issue manipulating some of the
internal state during graceful shutdown/cleanup. Some of the modules
had two steps: shut_down, followed by clean_up, while other had only
shut_down step. This triggered the following assert in file alarm.c

    alarm_cancel: assertion "alarms != NULL" failed

Bug: 21406940
Change-Id: Iab1f033a69cbff646a6b0f346760ae82f8b00b8f

9 years agoDO NOT MERGE Fix use-after-free while setting advertisement data.
Ian Coolidge [Thu, 21 May 2015 02:59:10 +0000 (19:59 -0700)]
DO NOT MERGE Fix use-after-free while setting advertisement data.

Producer context was freeing data buffers without
performing a deep copy on the passed structure.

Also added some const correctness so we can reason
about the state of btif_adv_data_t as its data
gets associated with the advertising instance.

Bug: 21343750
Change-Id: Ifea0209e8426b61d8456c299c836ba640bd30f31

9 years agoMerge "Sniff: Use correct sniff configuration for PAN & HS" into mnc-dev
Andre Eisenbach [Thu, 28 May 2015 16:18:46 +0000 (16:18 +0000)]
Merge "Sniff: Use correct sniff configuration for PAN & HS" into mnc-dev

9 years agoSniff: Use correct sniff configuration for PAN & HS
Hemant Gupta [Thu, 15 Jan 2015 14:45:07 +0000 (20:15 +0530)]
Sniff: Use correct sniff configuration for PAN & HS

Change-Id: I95c302dd46cdcc63058c9cb3de17fdfd6ffe8d2e

9 years agoMerge "A2DP audio HAL: implement get_presentation_position()" into mnc-dev
Eric Laurent [Thu, 28 May 2015 01:08:35 +0000 (01:08 +0000)]
Merge "A2DP audio HAL: implement get_presentation_position()" into mnc-dev

9 years agoMerge "Increase the min LE connection interval to 11.25ms" into mnc-dev
Prerepa Viswanadham [Wed, 27 May 2015 01:03:37 +0000 (01:03 +0000)]
Merge "Increase the min LE connection interval to 11.25ms" into mnc-dev

9 years agoMake secure connections mode configurable
Andre Eisenbach [Wed, 27 May 2015 00:40:12 +0000 (17:40 -0700)]
Make secure connections mode configurable

Change-Id: Id6101abc1fc339147c8b55023c7426ec1c807ee6

9 years agoIncrease the min LE connection interval to 11.25ms
Prerepa Viswanadham [Wed, 27 May 2015 00:25:38 +0000 (17:25 -0700)]
Increase the min LE connection interval to 11.25ms

To reduce audio choppiness, increase the min LE connection interval
to 11.25ms from 7.5ms

Bug: 18776956
Change-Id: I8404ebe2f9562d555a2131ae30dd63b74bb362a4

9 years agoA2DP audio HAL: implement get_presentation_position()
Eric Laurent [Tue, 26 May 2015 22:50:29 +0000 (15:50 -0700)]
A2DP audio HAL: implement get_presentation_position()

Bug: 21199150.
Change-Id: If8e95645b636be82a32420cad1ca6a3993e14f1c

9 years agoPairing is prompted with a wrong bd-address
Satya Calloji [Thu, 21 May 2015 23:44:06 +0000 (16:44 -0700)]
Pairing is prompted with a wrong bd-address

Slave initiated encryption was not being notified on the correct
address and causes the key to be lost on slave device triggering
new pairing once in a while.

Change-Id: I5441a9e0bcf8ba45199483ccd02f207892ec296e

9 years agoFix problem where multi-adv instances cannot be re-used
Andre Eisenbach [Fri, 22 May 2015 23:38:54 +0000 (16:38 -0700)]
Fix problem where multi-adv instances cannot be re-used

After using all multi-adv instances and stopping them, the instance ID
for each instance is incorrectly reset, causing the instance to be not
usable anymore.

Bug: 21404808
Change-Id: Ie3a3f07bc2204c7268567cb56248cd3eb7751742

9 years agoRecitfy condition when removing device from IRK resolving list
Nitin Arora [Fri, 22 May 2015 00:58:36 +0000 (17:58 -0700)]
Recitfy condition when removing device from IRK resolving list

This patch corrects the conditional logic before sending HCI
command to remove the IRK list entry from the IRK resolving
list based on the max size of resolving list

Change-Id: I9adc933f0988ae907b3e218ba63814d106784787

9 years agoFix build after cross-key issues broke non privacy enabled builds
Andre Eisenbach [Thu, 21 May 2015 06:55:13 +0000 (23:55 -0700)]
Fix build after cross-key issues broke non privacy enabled builds

Change-Id: Idef7239b07115be9290d7cca6610c603ffb3afa5

9 years agoFix device/address types and IRK value handling
Satya Calloji [Tue, 19 May 2015 23:08:40 +0000 (16:08 -0700)]
Fix device/address types and IRK value handling

Handles the device and address types based on BD address
and provides the IRK values as available.

Change-Id: I351e0aea7f5e55caefa405b34261c75e78306552

9 years agoFixed cross key for LE when paired over BR-EDR
Satya Calloji [Thu, 30 Apr 2015 20:58:59 +0000 (13:58 -0700)]
Fixed cross key for LE when paired over BR-EDR

SMP state machine was resending security request and waiting for a response
when paired over BR-EDR. The state machine state timed out due to this and
SMP failed while doing cross key pairing. Thus, user was asked for pairing
again.

Original author: Priti Aghera <paghera@broadcom.com>
Change-Id: I568f936bb7bee21fb78e8454469ecad3445f026f

9 years agoFix SMP pairing request issue on LE
Satya Calloji [Wed, 6 May 2015 16:24:06 +0000 (09:24 -0700)]
Fix SMP pairing request issue on LE

The cause of the failure:
- the master device sent the three keys to slave, but slave only receive
two and got the link drop before the third key is received.
- the slave device treats it as pairing failure due to the key missing.
SMP should wait for all keys been sent to controller before dropping the link.

Implement L2CAP fix channel tx_complete callback for this reason,
and it has been applied on the channel 6 (SMP).
Channel 7 (BR_SMP channel) was not keeping track of total_tx_unacked
number and closed the link too early. Added check in the
smp_br_key_distribution() and the ACL data tracking there before
posting SMP_BR_AUTH_CMPL_EVT.

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

Change-Id: If48a4c5e28b1d177f14ff089e8dfa3ace41eba83

9 years agoUnpair the other transport on a device paired
Satya Calloji [Tue, 21 Apr 2015 23:34:54 +0000 (16:34 -0700)]
Unpair the other transport on a device paired

When unpair is initiated for LE or BR-EDR transport for a device,
close the link for other transport and unpair the device on
both transports, since both transports on a device are paired
due to cross key.

Original author: Priti Aghera <paghera@broadcom.com>
Change-Id: I13d4757eb056c4bd4c7cc0699ec61a28852702c5

9 years agoStatic address is seen on scanner after unpairing
Satya Calloji [Fri, 24 Apr 2015 06:39:49 +0000 (23:39 -0700)]
Static address is seen on scanner after unpairing

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

9 years agoFix for chip capability version check
Satya Calloji [Thu, 7 May 2015 21:06:37 +0000 (14:06 -0700)]
Fix for chip capability version check

Fixes the issue of extended scan command being sent out
for non-capable chipsets

Bug: 20916419
Change-Id: Ib5d848f49c34a3fc9c053a7488e12fb0c252587c

9 years agoFix allocation for LE scan filter parameters
Nitin Arora [Fri, 12 Sep 2014 01:35:55 +0000 (18:35 -0700)]
Fix allocation for LE scan filter parameters

This change allocates memory for LE scan filter parameters
to copy filter params set by btif inquiry process initiated
using Settings UI

Change-Id: I56ed33b80af3f26ddc8a83edb807f88048503fa7

9 years agoFix for premature BLE RPA timeout
Nitin Arora [Wed, 11 Mar 2015 17:40:59 +0000 (10:40 -0700)]
Fix for premature BLE RPA timeout

RPA timeout expires prematurely when multiple FindMe server
instances start and stop advertisiment continuously. During start
adv TIMER3 is started using oneshot timer and during stop adv
same TIMER0 is stopped, so the TIMER3 is still running and expires
prematurely. This fix stops TIMER3 during disable adv and when RPA
is sent to controller.

Change-Id: I336f84043e5e0e8a833cc6080f8bcc0c1665893e

9 years agoFix GATT connection failure after BT reset
Satya Calloji [Thu, 7 May 2015 16:45:00 +0000 (09:45 -0700)]
Fix GATT connection failure after BT reset

Handles the address type incorrect value storage issue
and removes usage of DMT supported flag which was based
on legacy code

Bug: 20912064
Change-Id: I5bd20dc9cd0997ac3dbd4b346cc0513f1809f241

9 years agoUse correct structure to read LE connection handle
Nitin Arora [Thu, 31 Jul 2014 20:00:21 +0000 (13:00 -0700)]
Use correct structure to read LE connection handle

This patch corrects the retrieval of the connection handle
after the gatt write operation has succeeded successfully.

Change-Id: Iac79a64d6c626c2349b6f1a3744ea49a521a45f4

9 years agoBuild the shared library with --whole-archive
Zach Johnson [Tue, 19 May 2015 21:49:37 +0000 (14:49 -0700)]
Build the shared library with --whole-archive

For stack static libraries, use LOCAL_WHOLE_STATIC_LIBRARIES
to ensure they get --whole-archive applied to them.

This means module symbols in static libraries won't be
removed by the linker and dlsym will find them.

This patch also removes the code hacks we needed to
trick the linker into including the module symbols in
the final shared library.

Change-Id: I2463d0e6fb38f1e75c8293179cf9d4ca33eda84e

9 years agoFix for IRK and IR key write issue
Satya Calloji [Tue, 19 May 2015 21:42:32 +0000 (14:42 -0700)]
Fix for IRK and IR key write issue

Fixes the incorrect flipping of values
for IRK and IR keys in bt_config.conf file

Change-Id: Ia4f9c274b6a3f7594ec31d8bd89b27d1ae54ac78

9 years agoRe-enabled enhanced inquiry scan
Andre Eisenbach [Tue, 19 May 2015 19:22:59 +0000 (12:22 -0700)]
Re-enabled enhanced inquiry scan

A merge/re-factoring error caused enhanced inquiry scan to be disabled,
severely slowing down inquiry and device name resolution.

Change-Id: Id7bc1687a1e1bbbbc8b8b42cc184ce628b6d1b9c

9 years agoFix format-security warning found by clang/llvm.
Chih-Hung Hsieh [Tue, 19 May 2015 18:18:35 +0000 (11:18 -0700)]
Fix format-security warning found by clang/llvm.

BUG: 21299815
Change-Id: I3dd7e92444a9b439c210f7e6ce677307a38113ab

9 years agoFix string template in connection event debug log
Andre Eisenbach [Tue, 19 May 2015 01:44:03 +0000 (18:44 -0700)]
Fix string template in connection event debug log

Also fixed timestamp/bdname buffer confusion.

Change-Id: Idab9746a87ec665cba836c79978f03e13c36d17b

9 years agoMerge "Include osi_module reference in module_init funcion" into mnc-dev
Andre Eisenbach [Tue, 19 May 2015 02:04:44 +0000 (02:04 +0000)]
Merge "Include osi_module reference in module_init funcion" into mnc-dev

9 years agoInclude osi_module reference in module_init funcion
Andre Eisenbach [Tue, 19 May 2015 01:42:29 +0000 (18:42 -0700)]
Include osi_module reference in module_init funcion

This prevents a crash-loop if the module is stripped by the linker.

Change-Id: I7a3f0349cb62a9e73e003707c1f48ec0a6de7f67

9 years agoMerge "Include gki.h to get correct function declarations." into mnc-dev
Chih-Hung Hsieh [Mon, 18 May 2015 22:34:03 +0000 (22:34 +0000)]
Merge "Include gki.h to get correct function declarations." into mnc-dev

9 years agoInclude gki.h to get correct function declarations.
Chih-Hung Hsieh [Mon, 18 May 2015 21:36:21 +0000 (14:36 -0700)]
Include gki.h to get correct function declarations.

BUG: 21119653
Change-Id: I8e4caf1946f525ea57fadf003ca3fd7d303976cb
(cherry picked from commit 56350d683a15117b9e80ff3bf3b83671f3a7491a)

9 years agoFix AlarmTestHarness so alarm tests pass again
Zach Johnson [Mon, 18 May 2015 21:48:50 +0000 (14:48 -0700)]
Fix AlarmTestHarness so alarm tests pass again

Ensures all alarm resources are torn down before the
test ends, so the allocation tracker is happy and
doesn't assert-fail the tests.

Also guard alarm_shutdown to make sure it only runs
if lazy_initialize was run (to avoid undefined behavior)

Change-Id: Iaf78fe85edd2fc65b9c5ee11c74665a11a3bc9ba

9 years agoShutdown alarm callbacks on stack disable; added OSI module
Andre Eisenbach [Mon, 18 May 2015 16:41:06 +0000 (09:41 -0700)]
Shutdown alarm callbacks on stack disable; added OSI module

Change-Id: Iecf1e2258da012bdac69a4f57d38b12a272e3edd

9 years agoDO NOT MERGE Fix compilation on platforms with BLE_INCLUDED == FALSE
Andre Eisenbach [Sat, 9 May 2015 00:42:10 +0000 (17:42 -0700)]
DO NOT MERGE Fix compilation on platforms with BLE_INCLUDED == FALSE

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

9 years agoFix BT PAN crash by re-ordering callback initialization
Mudumba Ananth [Wed, 6 May 2015 16:15:41 +0000 (09:15 -0700)]
Fix BT PAN crash by re-ordering callback initialization

Bug: 20868163
Change-Id: I8e3bb844b96b762f90a85d8d9d678a1a9cec9c32

9 years agoBluetooth native dumpsys logging support (2/5)
Andre Eisenbach [Fri, 5 Dec 2014 17:40:20 +0000 (09:40 -0800)]
Bluetooth native dumpsys logging support (2/5)

Includes support for BTSnoop logging in memory.

Bug: 18508263
Change-Id: I175da528cbcdc00d40622647d518a74210cfe6fd

9 years agoOnly register key types with uinput that we can actually map
Andre Eisenbach [Mon, 11 May 2015 18:49:59 +0000 (11:49 -0700)]
Only register key types with uinput that we can actually map

Bug: 20641307
Change-Id: I40cb1e22c35963429481a2cc9da897b5b2f554fe

9 years agoElimininate unnecessary calls for releasing the wake lock.
Pavlin Radoslavov [Sat, 9 May 2015 02:39:31 +0000 (19:39 -0700)]
Elimininate unnecessary calls for releasing the wake lock.

Bug: 20884459
Change-Id: Id010cb29cf09b95800dc9f5fd5b660e71e4a47bc

9 years agoMerge "Work around clang/llvm compilation problems." into mnc-dev
Zach Johnson [Thu, 7 May 2015 21:17:16 +0000 (21:17 +0000)]
Merge "Work around clang/llvm compilation problems." into mnc-dev

9 years agoMerge "Handle lack of service better" into mnc-dev
David Stevens [Thu, 7 May 2015 17:32:10 +0000 (17:32 +0000)]
Merge "Handle lack of service better" into mnc-dev

9 years agoLE low power scan feature
Satya Calloji [Tue, 31 Mar 2015 20:24:32 +0000 (13:24 -0700)]
LE low power scan feature

LE low power extended scan feature stack changes
based on Google BLE spec v0.95

Bug: 20029342
Change-Id: I1db2d9bb648295340d0e93ca89d27e1b938d33d3

9 years agoMerge "Increases number of LE multi-advertiser instances supported" into mnc-dev
Andre Eisenbach [Thu, 7 May 2015 05:32:05 +0000 (05:32 +0000)]
Merge "Increases number of LE multi-advertiser instances supported" into mnc-dev

9 years agoIncreases number of LE multi-advertiser instances supported
Nitin Arora [Thu, 30 Apr 2015 18:47:21 +0000 (11:47 -0700)]
Increases number of LE multi-advertiser instances supported

Change-Id: I0d43b3922b2b5dc8c57511d908f45dfe8d8f1b9c

9 years agoFix compilation on some platforms with LE disabled
Andre Eisenbach [Thu, 7 May 2015 04:49:35 +0000 (21:49 -0700)]
Fix compilation on some platforms with LE disabled

Change-Id: Iabbb20b111beaaaef8a465f6917b4286e1b93972

9 years agoFix allocation of instance ID for LE services
Nitin Arora [Fri, 1 May 2015 00:20:27 +0000 (17:20 -0700)]
Fix allocation of instance ID for LE services

Defers the incrementing of the total services count after the allocation
of the instance ID for the service. If the increment is not deferred,
the current service is compared with its own instance in the cached
service list while allocating the instance ID. This leads to an
incorrect instance ID being allocated for the service.

Change-Id: I547888ae0f7015cfdb9b1a995373523699642a6c

9 years agoHandle lack of service better
David Stevens [Wed, 29 Apr 2015 17:44:04 +0000 (10:44 -0700)]
Handle lack of service better

- Set the service availability flag during ciev events
- Don't drop AT+COPS and AT+CNUM events on the floor if there is no
  service. Instead, send fake OK responses up the stack.

Bug: 20127723
Change-Id: Id2d9ae8c5df5b5372e50e804e44ed51657b2a4a9

9 years agoWork around clang/llvm compilation problems.
Chih-Hung Hsieh [Mon, 4 May 2015 19:12:39 +0000 (12:12 -0700)]
Work around clang/llvm compilation problems.

These patches will allow us to compile the whole AOSP with clang/llvm
before all the following problems are fixed.
* Suppress warnings on unused variables.
  * Remove unused static variables.
* Use only gcc to compile code that requires gcc atomic functions.
  They should be converted to standard atomic functions later.
* Suppress warnings on redefined typedefs.

BUG: 20765701
Change-Id: I19bc0a256c19502fabcabd1ca158637a8b5741a2

9 years agoMerge "Ensure PAN is initialized before invoking callbacks" into mnc-dev
Andre Eisenbach [Tue, 5 May 2015 19:36:12 +0000 (19:36 +0000)]
Merge "Ensure PAN is initialized before invoking callbacks" into mnc-dev

9 years agoEnsure PAN is initialized before invoking callbacks
Andre Eisenbach [Tue, 5 May 2015 18:39:28 +0000 (11:39 -0700)]
Ensure PAN is initialized before invoking callbacks

Fix minor conditional check and clean up surrounding code.

Bug: 20717705
Change-Id: I581fda37708062327c86cc0548b2665c9811be25

9 years agoFix a memory corruption issue when processing AVRCP packets.
Pavlin Radoslavov [Tue, 5 May 2015 01:28:52 +0000 (18:28 -0700)]
Fix a memory corruption issue when processing AVRCP packets.

As a side effect of the memory corruption, the AVRCP metadata
information was not visible.
Apparently, the bug was in a very old (almost unchanged) code,
and it was triggered because the rest of the code has evolved.

Bug: 20108272
Change-Id: I28466edf6a2fbfc31cfb46d74d03b6c0399f8594

9 years agoUse BTM structures for LE pairink keys and store LTK
Andre Eisenbach [Fri, 1 May 2015 20:14:59 +0000 (13:14 -0700)]
Use BTM structures for LE pairink keys and store LTK

The long term key (LTK) was not assigned to the correct struct element
before saving the key to NVRAM.

Change-Id: Icfce82f5b70518e725875771756edde0b9caeb88

9 years agoStop media task alarm when task is exiting
Nitin Arora [Fri, 1 May 2015 20:11:28 +0000 (13:11 -0700)]
Stop media task alarm when task is exiting

Bug: 20717705
Change-Id: I76e76cf33d7c9f4366f921daf2230e4f681098f7

9 years agoChange "ltk" to "pltk" and "csrk" to "pcsrk"
Andre Eisenbach [Thu, 30 Apr 2015 22:29:57 +0000 (15:29 -0700)]
Change "ltk" to "pltk" and "csrk" to "pcsrk"

To clarify local/peer key deliniation.

Change-Id: I79573015c80456ce3287acfe5551a6881ff581b2

9 years agoFix LE pairing LTK storage issue
Andre Eisenbach [Thu, 30 Apr 2015 05:27:15 +0000 (22:27 -0700)]
Fix LE pairing LTK storage issue

Two separate issues prevented the correct LTK from being storred in
non-volatile storage and thus prevented an LE device from working after
Bluetooth was restarted:

1. tBTM_SEC_BLE_KEYS contained a field "pltk" which stored the LTK, but
   downstream the field "ltk" in the same structure was used to access
   the key.

2. The structure element p_key_value was not deep-copied for
   BTA_DM_BLE_KEY_EVT events, causing data corruption and instabilities.

This patch addresses both issues.

Bug: 20091926
Change-Id: I9f9481a44bfe83cacd351f9e578451e77b573564

9 years agoAdd LE device to device database before adding LE keys
Andre Eisenbach [Wed, 29 Apr 2015 18:25:50 +0000 (11:25 -0700)]
Add LE device to device database before adding LE keys

A small bug in btif_read_le_key() would prevent a paired LE device from
being added back into the internal device database after reboot, causing
the security keys not being loaded.

Also added a debug statement to trace keys being loaded.

Bug: 20091926
Change-Id: Id2d6c69497857edc21e2d4c6a67ad9e8dadabcaa

9 years agoFix PAN initialization
Nitin Shivpure [Tue, 28 Apr 2015 07:19:04 +0000 (12:49 +0530)]
Fix PAN initialization

Change-Id: I32d8975f0f6e1ea18a361a19260ffea7a3ec8467

9 years agoKeep track of pending LE background connections
Andre Eisenbach [Tue, 28 Apr 2015 08:56:38 +0000 (01:56 -0700)]
Keep track of pending LE background connections

In order to only scan for peripherals when we have pending background
connections, we need to keep track of devices that have been added to
the whitelist.

Bug: 20091926
Change-Id: Id7b1861829d984c150d69371ebd13f7d52d3093c

9 years agoCross transport key mapping fixes
Chaojing Sun [Wed, 22 Apr 2015 20:40:21 +0000 (13:40 -0700)]
Cross transport key mapping fixes

Change-Id: I22d97303054eccc876c4a9c7c0a50e369ff4fa62

9 years agoMerge commit '1c00656' into merge2
Etan Cohen [Fri, 24 Apr 2015 20:42:20 +0000 (13:42 -0700)]
Merge commit '1c00656' into merge2

9 years agoMerge commit '00e8f5e' into merge2
Etan Cohen [Fri, 24 Apr 2015 20:41:56 +0000 (13:41 -0700)]
Merge commit '00e8f5e' into merge2

Change-Id: Ifa83bd342458eba33fdd11a9db38d2f9e818b759

9 years agoMerge commit '3aa5187' into merge2
Etan Cohen [Fri, 24 Apr 2015 20:40:29 +0000 (13:40 -0700)]
Merge commit '3aa5187' into merge2

9 years agoMerge commit 'd9bb94c' into merge2
Etan Cohen [Fri, 24 Apr 2015 20:40:15 +0000 (13:40 -0700)]
Merge commit 'd9bb94c' into merge2

Change-Id: Ib7b05e8907497cf3e2f06a94ff25686ccba43a81

9 years agoMerge commit 'ca8e356' into merge2
Etan Cohen [Fri, 24 Apr 2015 20:36:09 +0000 (13:36 -0700)]
Merge commit 'ca8e356' into merge2

9 years agoFix LE pairing on hosts with privacy disabled
Andre Eisenbach [Fri, 24 Apr 2015 05:19:59 +0000 (22:19 -0700)]
Fix LE pairing on hosts with privacy disabled

When privacy is disabled, the local BDA is not set correctly when ACL
connections are created. This leads to SMP pairing challenges to be sent
with the wrong local BDA (00:00:00:00:00:00).

Bug: 20091926
Change-Id: I554245a3a3cbed72d79aa6c1261c813999019e2b

9 years agoAdd missing __func__ in btif_hf init()
Andre Eisenbach [Thu, 23 Apr 2015 17:54:10 +0000 (10:54 -0700)]
Add missing __func__ in btif_hf init()

Change-Id: I0fe4ea75c6448f43f1638614a9a6519fa58962de

9 years agoFix possible race conditoi in hands-free initialization
Andre Eisenbach [Thu, 23 Apr 2015 02:21:03 +0000 (19:21 -0700)]
Fix possible race conditoi in  hands-free initialization

With the LE-only mode changes in place, there is a potential race
condition between the audio-gateway (AG) registration and the hands-free
service initialization as the core stack is now initialized before the
hands-free service starts.

Modified from patch submitted by Nitin Arora <niarora@codeaurora.org>.

Bug: 20481584
Change-Id: I78d62329aa5e4113c72fac2d40efa671442bae2d

9 years agoReduce log spam on TX queue congestion
Andre Eisenbach [Wed, 22 Apr 2015 22:38:21 +0000 (15:38 -0700)]
Reduce log spam on TX queue congestion

Bug: 19544388
Change-Id: Ib16878c08345983b3f72b484f2d5e4eb4791f2f9

9 years agomerge in m-wireless-internal-release history after reset to 00e8f5ed49bc05c3f8b673e4a...
The Android Automerger [Wed, 22 Apr 2015 13:45:28 +0000 (06:45 -0700)]
merge in m-wireless-internal-release history after reset to 00e8f5ed49bc05c3f8b673e4af5e5c650a0ead18

9 years agoMerge "Initialize white list size after stack reset"
Andre Eisenbach [Wed, 22 Apr 2015 04:27:38 +0000 (04:27 +0000)]
Merge "Initialize white list size after stack reset"

9 years agoFix A2DP source double initialization problem
Andre Eisenbach [Tue, 21 Apr 2015 04:46:37 +0000 (21:46 -0700)]
Fix A2DP source double initialization problem

Fixed a problem where A2DP source was initialized twice. Once before
btif was properly initialize and then a second time when the JNI
requests A2DP to be initialized, which would then fail.

Change-Id: Ia5f10a5bda344fe3bd66818a302b6b3f9db32a20

9 years agomerge in m-wireless-internal-release history after reset to 00e8f5ed49bc05c3f8b673e4a...
The Android Automerger [Tue, 21 Apr 2015 13:45:55 +0000 (06:45 -0700)]
merge in m-wireless-internal-release history after reset to 00e8f5ed49bc05c3f8b673e4af5e5c650a0ead18

9 years agoInitialize white list size after stack reset
Priti Aghera [Sat, 18 Apr 2015 01:11:24 +0000 (18:11 -0700)]
Initialize white list size after stack reset

The white list size is not currently set correctly, preventing devices
from being added to the LE whitelist, thus completely breaking
re-connects.

This fixes the white list management and propagates the correct reason
code for HID close events to make sure a device is re-added to the white
list if necessary.

Bug: 20290744
Change-Id: I46d7254ff3568c9964688cb192b9deb6b7d3062d

9 years agomerge in m-wireless-internal-release history after reset to 00e8f5ed49bc05c3f8b673e4a...
The Android Automerger [Mon, 20 Apr 2015 13:51:05 +0000 (06:51 -0700)]
merge in m-wireless-internal-release history after reset to 00e8f5ed49bc05c3f8b673e4af5e5c650a0ead18

9 years agoMerge "Fix missing includes under glibc on new code." into m-wireless-dev
Ian Coolidge [Fri, 17 Apr 2015 06:09:29 +0000 (06:09 +0000)]
Merge "Fix missing includes under glibc on new code." into m-wireless-dev

9 years agoMerge "Make unused tagging consistent, using the portable macro." into m-wireless-dev
Ian Coolidge [Fri, 17 Apr 2015 06:09:12 +0000 (06:09 +0000)]
Merge "Make unused tagging consistent, using the portable macro." into m-wireless-dev

9 years agoMerge "Make inline functions static also." into m-wireless-dev
Ian Coolidge [Fri, 17 Apr 2015 06:08:43 +0000 (06:08 +0000)]
Merge "Make inline functions static also." into m-wireless-dev

9 years agoFix missing includes under glibc on new code.
Ian Coolidge [Thu, 16 Apr 2015 20:50:46 +0000 (13:50 -0700)]
Fix missing includes under glibc on new code.

Change-Id: I2451f782ce3f51147ebaddc559c616eac0a2b7d9

9 years agoMake unused tagging consistent, using the portable macro.
Ian Coolidge [Fri, 17 Apr 2015 00:36:02 +0000 (17:36 -0700)]
Make unused tagging consistent, using the portable macro.

Change-Id: Id3b68bd32edfce13a847eef55ae81cd47e8fc112

9 years agoMake inline functions static also.
Ian Coolidge [Thu, 16 Apr 2015 21:07:25 +0000 (14:07 -0700)]
Make inline functions static also.

inline is a hint, visibility should be limited in case
these are not inlined.

Change-Id: I07e66fd02d33ff58ebb50d226ff9b36c562445c8

9 years agoFix compilation when BLE_PRIVACY_SPT is false.
Ian Coolidge [Thu, 16 Apr 2015 22:43:36 +0000 (15:43 -0700)]
Fix compilation when BLE_PRIVACY_SPT is false.

Change-Id: I3cd3eb11e479dd00ab98dc7c72bc7fd15c009e4f

9 years agobluedroid: compile error hammerhead-userdebug_clang
Mark Salyzyn [Thu, 16 Apr 2015 18:13:39 +0000 (11:13 -0700)]
bluedroid: compile error hammerhead-userdebug_clang

- This was a clang complaint, not a gcc complaint
- memset event to be portable to all compile environments
- error as follows:

external/bluetooth/bluedroid/osi/./src/reactor.c:90:34:
    error: missing field data initializer [-Werror,-Wmissing-field-initializers]
  struct epoll_event event = { 0 };
                                 ^
external/bluetooth/bluedroid/osi/./src/reactor.c:151:34:
    error: missing field data initializer [-Werror,-Wmissing-field-initializers]
  struct epoll_event event = { 0 };
                                 ^
external/bluetooth/bluedroid/osi/./src/reactor.c:174:34:
    error: missing field data initializer [-Werror,-Wmissing-field-initializers]
  struct epoll_event event = { 0 };
                                 ^
3 errors generated.
make: *** [out/target/product/hammerhead/obj/STATIC_LIBRARIES/libosi_intermediates/./src/reactor.o] Error 1

Change-Id: I14b884cf1665c68aff1e5afd3df65ac10af474d2

9 years agomerge in m-wireless-internal-release history after reset to ca8e356bebe608310ce50d0cb...
The Android Automerger [Thu, 16 Apr 2015 13:45:36 +0000 (06:45 -0700)]
merge in m-wireless-internal-release history after reset to ca8e356bebe608310ce50d0cbc5c821a694554a9

9 years agoFix LE pairing
Andre Eisenbach [Thu, 16 Apr 2015 00:56:03 +0000 (17:56 -0700)]
Fix LE pairing

Change-Id: Ie4ecab207f83d8ec27c5922c0c794f8bd824255f

9 years agoLE Data Packet Extension support
Priti Aghera [Thu, 18 Dec 2014 21:55:48 +0000 (13:55 -0800)]
LE Data Packet Extension support

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

9 years agoAdd support for Bluetooth Sim Access Profile (1/4)
Casper Bonde [Tue, 7 Apr 2015 09:05:07 +0000 (11:05 +0200)]
Add support for Bluetooth Sim Access Profile (1/4)

Change-Id: Ie1dd95ee00976255f74b6747a1d3fc3ed59152f3

9 years agoAdd a section in style guide: __func__ should be used over __FUNCTION__.
Sharvil Nanavati [Tue, 14 Apr 2015 19:01:55 +0000 (12:01 -0700)]
Add a section in style guide: __func__ should be used over __FUNCTION__.

Change-Id: I93eb3e512b6030818b06a63f13999bd45dcfec4e

9 years agoFix compilation error with privacy disabled
Andre Eisenbach [Thu, 16 Apr 2015 05:16:47 +0000 (22:16 -0700)]
Fix compilation error with privacy disabled

Change-Id: I06d1322789fbd547080a6bd64e9c7153ddb6d70e

9 years agoFix LE pairing
Andre Eisenbach [Thu, 16 Apr 2015 00:56:03 +0000 (17:56 -0700)]
Fix LE pairing

Change-Id: Ie4ecab207f83d8ec27c5922c0c794f8bd824255f

9 years agoFix build issues after the merge
Vinit Deshpande [Wed, 15 Apr 2015 20:02:58 +0000 (13:02 -0700)]
Fix build issues after the merge

Change-Id: Ia856311187a0b2168cb859bd8b2300ff59df6569

9 years agoLE Data Packet Extension support
Priti Aghera [Thu, 18 Dec 2014 21:55:48 +0000 (13:55 -0800)]
LE Data Packet Extension support

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

9 years agoAdd support for Bluetooth Sim Access Profile (1/4)
Casper Bonde [Tue, 7 Apr 2015 09:05:07 +0000 (11:05 +0200)]
Add support for Bluetooth Sim Access Profile (1/4)

Change-Id: Ie1dd95ee00976255f74b6747a1d3fc3ed59152f3

9 years agomerge in m-wireless-internal-release history after reset to 3676653d4d6ba02235d092b07...
The Android Automerger [Wed, 15 Apr 2015 13:45:34 +0000 (06:45 -0700)]
merge in m-wireless-internal-release history after reset to 3676653d4d6ba02235d092b07dafcc3c97126d8a

9 years agoam f29a2fb..e07ad10 from mirror-m-wireless-internal-release
Vinit Deshpande [Tue, 14 Apr 2015 23:00:10 +0000 (16:00 -0700)]
am f29a2fb..e07ad10 from mirror-m-wireless-internal-release

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

9 years agoAdd a section in style guide: __func__ should be used over __FUNCTION__.
Sharvil Nanavati [Tue, 14 Apr 2015 19:01:55 +0000 (12:01 -0700)]
Add a section in style guide: __func__ should be used over __FUNCTION__.

Change-Id: I93eb3e512b6030818b06a63f13999bd45dcfec4e

9 years agomerge in m-wireless-internal-release history after reset to d232721ae5e5b6949a5249f0d...
The Android Automerger [Tue, 14 Apr 2015 13:46:03 +0000 (06:46 -0700)]
merge in m-wireless-internal-release history after reset to d232721ae5e5b6949a5249f0d116408b8a3c5f1d

9 years agoL2CAP socket - fix merge errors
Casper Bonde [Mon, 13 Apr 2015 19:58:56 +0000 (21:58 +0200)]
L2CAP socket - fix merge errors

This fixes a few changes that was reverted by mistake,
causing uninitialized data to be used as instance data
in GAP and no buffers allocated to the L2CAP sockets.

Change-Id: I060c5faf602c1dedcc34b4acd1417949820a4da4