OSDN Git Service

android-x86/system-bt.git
8 years agoPrevent integer overflows during GATT signing
Ajay Panicker [Fri, 23 Oct 2015 23:49:11 +0000 (16:49 -0700)]
Prevent integer overflows during GATT signing

Bug: 17901099
Change-Id: Ib61113b19c9c9798b9ea992fad0ce997dcc2e2f8

8 years agoRaise alarm callback thread priority
Andre Eisenbach [Fri, 23 Oct 2015 17:40:36 +0000 (10:40 -0700)]
Raise alarm callback thread priority

Since alarms [/callbacks] are used in the critical audio path, raising
the thread priority is required to ensure timely encoding/transmission
of audio packets and avoiding thread pre-emption.

This patch indiscriminatly raises the (single) callback thread priority,
affecting all alarm callbacks. In the future, thread priotiry should be
adjusted based on the alarms pending in the queue.

Bug: 24570959
Change-Id: I64928fd7325f1d6f76815a185dbccf1e01ae30d2

8 years agoReduce persistence on aquiring master role
Mattias Agren [Wed, 14 Oct 2015 15:05:58 +0000 (17:05 +0200)]
Reduce persistence on aquiring master role

Whenever a device has more than 1 ACL link active and transferring
data on one of its links via PAN, HH or JV (RFCOMM) the sys busy/idle
state toggles frequently. To avoid triggering role switches for each
of these events we filter this out and let the other SYS events handle
it in combination with other role policy management code. Ideally we
should revert the toggling to properly reflect the busy/idle state of
each profile but to limit risk of side effects at this stage we will
make this intermittent change.

This also affects audio streaming in certain cases.

Bug: 2457095925129209
Change-Id: I141e17ee069c82624e153fd8de5db90ae93724b9

8 years agoFix flaky EagerReaderTest.test_large_data_multibyte
Andre Eisenbach [Fri, 20 Nov 2015 19:41:16 +0000 (11:41 -0800)]
Fix flaky EagerReaderTest.test_large_data_multibyte

eager_reader_read() makes no guarantee that the number of bytes read
equals the number of bytes to be read. Insisting that it must in the
test can lead to race conditions where not all data is read at once and
the test fails.

Adjusted test to match API promise.

Change-Id: I5df4b6d8df61d0601402511bb3d9f29f22378981

8 years agoPass unknown run_unit_tests long arguments to tests
Scott James Remnant [Wed, 18 Nov 2015 19:18:02 +0000 (11:18 -0800)]
Pass unknown run_unit_tests long arguments to tests

e.g. ./run_unit_tests.sh --v=2
     ./run_unit_tests.sh --gtest_filter=*Advertise*

Change-Id: I63e7549d850a15107ca56333868cc8ccd3eeb893

8 years agoAdd test filter option to run_unit_tests
Scott James Remnant [Wed, 18 Nov 2015 17:35:43 +0000 (09:35 -0800)]
Add test filter option to run_unit_tests

e.g. ./run_unit_test.sh net_test_hci.HciLayerTest.*

Useful since this script wraps the hard part of pushing the binary
to the device and then shell to running it.

This also allows multiple individual tests to be run, since the filter
is per-target rather than global.

Change-Id: I74a6511ab226fb55054cbb840bb47815e0fdc97e

8 years agoGive run_unit_tests an exit code
Scott James Remnant [Wed, 18 Nov 2015 17:40:03 +0000 (09:40 -0800)]
Give run_unit_tests an exit code

So you can tell whether tests failed by checking $?

Change-Id: I0eb55c49946a4183206bd68cd3c0b1bdc69f6bb0

8 years agoservice/test: Reset command-line on SetUp
Arman Uguray [Wed, 18 Nov 2015 03:29:31 +0000 (19:29 -0800)]
service/test: Reset command-line on SetUp

Changed SettingsTest to reset the global base::CommandLine on
SetUp so the the first test case that runs follows a clean state.

Bug: 25753839
Change-Id: I0d536e1f85036fccd0099e03f7f59289f5411c50

8 years agoAdd -s <specific device> to run_unit_tests
Scott James Remnant [Tue, 17 Nov 2015 23:09:43 +0000 (15:09 -0800)]
Add -s <specific device> to run_unit_tests

For the developer with more than one Android or Brillo device plugged
into their workstation at once.

Change-Id: Ice273564f2debdc0708ce473be6119ff2ae33f39

8 years agoMerge "service/client: Add register|unregister-gatt"
Arman Uguray [Thu, 12 Nov 2015 20:45:10 +0000 (20:45 +0000)]
Merge "service/client: Add register|unregister-gatt"

8 years agoMerge "service: Introduce bluetooth::GattClient"
Arman Uguray [Thu, 12 Nov 2015 20:45:01 +0000 (20:45 +0000)]
Merge "service: Introduce bluetooth::GattClient"

8 years agoMerge "service: Add IBluetoothGattClient IPC bindings"
Arman Uguray [Thu, 12 Nov 2015 20:44:41 +0000 (20:44 +0000)]
Merge "service: Add IBluetoothGattClient IPC bindings"

8 years agonet_test_bluetooth: replace with gtest variant
Scott James Remnant [Wed, 11 Nov 2015 19:51:20 +0000 (11:51 -0800)]
net_test_bluetooth: replace with gtest variant

Bug: 25385380
Change-Id: Ia719363823d8d538caa6b42f076d5d6d737ae036

8 years agoFix SIGBUS crash when copying data
Pavlin Radoslavov [Tue, 10 Nov 2015 02:39:03 +0000 (18:39 -0800)]
Fix SIGBUS crash when copying data

We have the following memory alignment-related issue, that seems
to be architecture/compiler/memcpy(3) specific.

Within struct tBTIF_CONTEXT_SWITCH_CBACK, the beginning of the
zero-length array "char p_param[]" is not aligned (because of the
struct internals).
However, this p_param pointer is casted within function
btif_gattc_deep_copy() to the struct pointer (btif_adv_data_t *).
By definition, the memory pointed to by such pointer is suppose
to be aligned:

    btif_adv_data_t *dst = (btif_adv_data_t*) p_dest;

It seems that on some architectures/compilers the executed memcpy()
instructions are optimized for such memory alignment.
If the memory was not aligned, we get SIGBUS.

Apparently, just using (void *) casting for the memcpy() destination,
avoids using the optimized memory aligned instructions:
  memcpy((void *)dst, src, ...);

The solutions are twofold:
 * Make sure that "char p_param[]" within struct
   tBTIF_CONTEXT_SWITCH_CBACK is aligned. Otherwise, the casting
   to "(btif_adv_data_t*)" can be problematic.
 * Add (void *) casting to all memcpy() calls which might be
   referring to such mis-aligned memory.
   This is done by using the new macro maybe_non_aligned_memcpy()
   in all places that such casting might be needed.

Either solution is sufficient to prevent the crash as identified in
this particular case. We need to apply both solutions, to reduce the
chance of running again into a similar issue.

Bug: 25601669
Change-Id: I6c49645c00f10c594a5d1e53a9fac202c506657c

8 years agoIndicate failed tests in run_unit_tests.sh
Andre Eisenbach [Tue, 10 Nov 2015 22:17:20 +0000 (14:17 -0800)]
Indicate failed tests in run_unit_tests.sh

Previously "run_unit_tests.sh --all" did not indicate to the user if a
unit test other than the last one failed.

Change-Id: I9b64e4280612cd9af18acc17f245b8760bea793f

8 years agoMerge "Retry HID Polling when EINTR is returned"
Myles Watson [Wed, 11 Nov 2015 18:39:38 +0000 (18:39 +0000)]
Merge "Retry HID Polling when EINTR is returned"

8 years agoservice/client: Add register|unregister-gatt
Arman Uguray [Wed, 11 Nov 2015 02:05:33 +0000 (18:05 -0800)]
service/client: Add register|unregister-gatt

Added the register-gatt and unregister-gatt commands to bluetooth-cli.

Bug: 25128256
Change-Id: Ic2521a6297d277de6feb4cb22dbc8bb60794da5f

8 years agoservice: Introduce bluetooth::GattClient
Arman Uguray [Wed, 11 Nov 2015 02:03:36 +0000 (18:03 -0800)]
service: Introduce bluetooth::GattClient

Added the bluetooth::GattClient class that will provide a
per-application entry point to GATT client-role operations. Implemented
IBluetoothGattClient client registration.

Bug: 25128256
Change-Id: I14ec0ddfa7057eedeb5e4f330fcbc2d09f6f3765

8 years agoNull-terminate hex string in uuid_new()
Ajay Panicker [Tue, 10 Nov 2015 23:01:52 +0000 (15:01 -0800)]
Null-terminate hex string in uuid_new()

Change-Id: I28d8b9e6495992ab990e9bd618221373848957c8

8 years agoservice: Add IBluetoothGattClient IPC bindings
Arman Uguray [Tue, 10 Nov 2015 23:48:42 +0000 (15:48 -0800)]
service: Add IBluetoothGattClient IPC bindings

Added the Binder IPC bindings for the IBluetoothGattClient API.

Bug: 25128256
Change-Id: Idc37ac7d85c0d3a2aa17e2b95ee588d590a8bb8f

8 years agoRetry HID Polling when EINTR is returned
Myles Watson [Tue, 10 Nov 2015 22:35:57 +0000 (14:35 -0800)]
Retry HID Polling when EINTR is returned

While I'm here
 - use __func__ consistently in btif_hh_poll_event_thread.
 - remove braces around a single line

BUG: 24647083
Change-Id: I80b99ff0d3ba6336f5ab7a517269fdf63df59b37
Signed-off-by: Myles Watson <mylesgw@google.com>
8 years agoFix net_test_hci
Andre Eisenbach [Tue, 10 Nov 2015 20:18:52 +0000 (12:18 -0800)]
Fix net_test_hci

vendor->send_command is not send during init(), it's called as a result
to calling enable().

Change-Id: I498870a63057e3644c0b889cd5be046cb41db88d

8 years agoMerge "service/doc: Add Binder GATT client API definition"
Arman Uguray [Mon, 9 Nov 2015 22:01:53 +0000 (22:01 +0000)]
Merge "service/doc: Add Binder GATT client API definition"

8 years agoFix an error loading audio.a2dp.default.so library
Ajay Panicker [Wed, 4 Nov 2015 00:45:33 +0000 (16:45 -0800)]
Fix an error loading audio.a2dp.default.so library

Fixes an issue where a symbol is being stripped from the compiled
library preventing it from being loaded.

Bug: 21743601
Change-Id: I60347e83ee85ec282c25ae76f3cf80567bcd19a2

8 years agoFix broken test caused by misordered callback arguments.
Sharvil Nanavati [Sat, 7 Nov 2015 10:12:16 +0000 (02:12 -0800)]
Fix broken test caused by misordered callback arguments.

Change-Id: I16976a2a680eab76af31090548c2efc53bebaa60

8 years agoTreat empty/truncated GATT cache as error
Andre Eisenbach [Mon, 10 Aug 2015 06:38:42 +0000 (23:38 -0700)]
Treat empty/truncated GATT cache as error

Bug: 23054535
Change-Id: I6f60ff556204dabca91ce9075d5802d75fd35857

8 years agoservice/doc: Add Binder GATT client API definition
Arman Uguray [Tue, 27 Oct 2015 02:58:46 +0000 (19:58 -0700)]
service/doc: Add Binder GATT client API definition

Added AIDL-style docs for the GATT client Binder API.

Bug: 25128256
Change-Id: I03c4c5a371600b3946a6692a3d0c87f7e529d96a

8 years agoAlways update remote address type during LE scan
Andre Eisenbach [Thu, 5 Nov 2015 23:38:36 +0000 (15:38 -0800)]
Always update remote address type during LE scan

This will ensure that devices which do not contain a device name in the
advertising record are stored with the correct address type to ensure
re-connection to the device succeeds.

Bug: 25499163
Change-Id: I85f18ce2de267844c5d5ed49beeb448b9b074d74

8 years agoRemoved libpower-related references.
Pavlin Radoslavov [Thu, 5 Nov 2015 19:46:28 +0000 (11:46 -0800)]
Removed libpower-related references.

Removed libpower-related references, because those are not
needed anymore. Now, the wakelock-related calls and references
are implemented within osi/src/alarm.c

Change-Id: Ifdb232b9724af216b9b414f8b65e85cd713c20d3

8 years agogn-build: Get net_test_bluetooth to compile
Marie Janssen [Thu, 11 Jun 2015 22:18:01 +0000 (15:18 -0700)]
gn-build: Get net_test_bluetooth to compile

This makes net_test_bluetooth compile.

Bug: 21584091

Change-Id: Id0c3d6bdcfd6f2c75c749e7f5a306645371fbb25

8 years agoFix bug in SDP 128-bit UUID lookup
Andre Eisenbach [Wed, 4 Nov 2015 16:28:30 +0000 (08:28 -0800)]
Fix bug in SDP 128-bit UUID lookup

Also re-factored the surrounding code slightly to where it would have
prevented this type of bug in the first place...

Change-Id: I7b7ed4459c4f377d97b608bfe2e0c13aac31680e

8 years agoDo not mask out secure connections (SC) bit for BT <4.2
Andre Eisenbach [Wed, 4 Nov 2015 16:20:22 +0000 (08:20 -0800)]
Do not mask out secure connections (SC) bit for BT <4.2

Bug: 25467621
Change-Id: Ifdb52295fa5b8c5a39524a722dc044227c735240

8 years agoMerge "Rename net_test_bluedroid to net_test_bluetooth"
Andre Eisenbach [Mon, 2 Nov 2015 20:46:32 +0000 (20:46 +0000)]
Merge "Rename net_test_bluedroid to net_test_bluetooth"
am: c2ad136c3e

* commit 'c2ad136c3e19ca526356d7fd6fe44dcc1e7aa062':
  Rename net_test_bluedroid to net_test_bluetooth

8 years agoMerge "Rename net_test_bluedroid to net_test_bluetooth"
Andre Eisenbach [Mon, 2 Nov 2015 20:39:59 +0000 (20:39 +0000)]
Merge "Rename net_test_bluedroid to net_test_bluetooth"

8 years agoFix interop database unit test
Andre Eisenbach [Mon, 2 Nov 2015 18:56:05 +0000 (18:56 +0000)]
Fix interop database unit test
am: f2a7e6c4eb

* commit 'f2a7e6c4eba75d8c8a3103fe27bcd06f669d609e':
  Fix interop database unit test

8 years agoFix interop database unit test
Andre Eisenbach [Mon, 2 Nov 2015 18:47:28 +0000 (10:47 -0800)]
Fix interop database unit test

Change-Id: Id2e45582b92e83804b55d4e8c918e32a6a2dab79

8 years agoMerge "Serialize remote version query over LE"
Andre Eisenbach [Fri, 30 Oct 2015 17:27:42 +0000 (17:27 +0000)]
Merge "Serialize remote version query over LE"
am: a0a3dacd68

* commit 'a0a3dacd682cc3e8c9ee4b5a196e06aeada6cc49':
  Serialize remote version query over LE

8 years agoMerge "Serialize remote version query over LE"
Andre Eisenbach [Fri, 30 Oct 2015 17:23:08 +0000 (17:23 +0000)]
Merge "Serialize remote version query over LE"

8 years agoSerialize remote version query over LE
Andre Eisenbach [Thu, 29 Oct 2015 22:48:06 +0000 (15:48 -0700)]
Serialize remote version query over LE

Some devices (ex. Nexus Player remote) do not take well to having the
remote version queried while a remote feature request is also sent and
subsequently fail encryption.

This patch serializes the query of the remote version and requires both
remote features and the remote version to be read before calling a
connection established.

Bug: 25357767
Change-Id: Ie70eea241b47b81778d8e0df47f3a8f376316932

8 years agoRemove unused HCI_PROTO_REVISION
Andre Eisenbach [Fri, 30 Oct 2015 16:16:34 +0000 (16:16 +0000)]
Remove unused HCI_PROTO_REVISION
am: 879aeec727

* commit '879aeec72706fc7bae66277350ae9a49648a73e7':
  Remove unused HCI_PROTO_REVISION

8 years agoRemove unused HCI_PROTO_REVISION
Andre Eisenbach [Tue, 27 Oct 2015 20:26:19 +0000 (13:26 -0700)]
Remove unused HCI_PROTO_REVISION

Change-Id: Icec52e4e63b14f2fe7a61cf5077e40c5e8baeff5

8 years agoRename net_test_bluedroid to net_test_bluetooth
Andre Eisenbach [Thu, 29 Oct 2015 18:18:20 +0000 (11:18 -0700)]
Rename net_test_bluedroid to net_test_bluetooth

Also remove other bluedroid references.

Change-Id: I349e48e50b0a0a45ca1267a765145299837601d3

8 years agoEnable kernel wakelocks and timers
Marie Janssen [Tue, 27 Oct 2015 23:12:28 +0000 (23:12 +0000)]
Enable kernel wakelocks and timers
am: 28bf007f71

* commit '28bf007f7103ccd36d5fa2f87837947a27cc698d':
  Enable kernel wakelocks and timers

8 years agoEnable kernel wakelocks and timers
Marie Janssen [Mon, 21 Sep 2015 17:49:08 +0000 (10:49 -0700)]
Enable kernel wakelocks and timers

Use kernel wakelocks now that they are available to us, and use thread
timers instead to eliminate bt_os_callouts usage.

Bug: 23390297
Change-Id: Ic9428457807eab5125d35eae3df6cd2a05a2a659

8 years agoCheck remote LMP version before enabling secure connections
Andre Eisenbach [Tue, 27 Oct 2015 20:30:54 +0000 (20:30 +0000)]
Check remote LMP version before enabling secure connections
am: 27e239dbd3

* commit '27e239dbd31dd9ee7fab5fb8558fbd2292cf7e5d':
  Check remote LMP version before enabling secure connections

8 years agoCheck remote LMP version before enabling secure connections
Andre Eisenbach [Mon, 26 Oct 2015 20:49:17 +0000 (13:49 -0700)]
Check remote LMP version before enabling secure connections

Request remote version information for LE links when connecting and
ensure LMP version is >= 8 (Bluetooth 4.2) before setting the LinkKey
bits in the pairing request.

This is to ensure older remote devices do not get confused by the
additional bit(s) in the pairing request.

Bug: 25277879
Change-Id: I25424e541fa5244d8f522dffc62cdedc24f4f35b

8 years agoWorkaround for H4 HCI stream corruption during LE scans
Andre Eisenbach [Wed, 21 Oct 2015 20:54:58 +0000 (20:54 +0000)]
Workaround for H4 HCI stream corruption during LE scans
am: bdd19e0873

* commit 'bdd19e0873854567bb6bd9bc8905a87a3a4744c4':
  Workaround for H4 HCI stream corruption during LE scans

8 years agoRemove absolute volume control whitelist
Andre Eisenbach [Wed, 21 Oct 2015 20:54:55 +0000 (20:54 +0000)]
Remove absolute volume control whitelist
am: 58593a0273

* commit '58593a02736ff9ac9bdccd0e3186602f17452cdf':
  Remove absolute volume control whitelist

8 years agoFix 128-bit UUID byte order for GATT-over-BR/EDR
Andre Eisenbach [Wed, 21 Oct 2015 20:54:51 +0000 (20:54 +0000)]
Fix 128-bit UUID byte order for GATT-over-BR/EDR
am: 61968383a6

* commit '61968383a63be05a335e26bc53ef39d9af98ad72':
  Fix 128-bit UUID byte order for GATT-over-BR/EDR

8 years agoWorkaround for H4 HCI stream corruption during LE scans
Andre Eisenbach [Fri, 11 Sep 2015 04:41:39 +0000 (21:41 -0700)]
Workaround for H4 HCI stream corruption during LE scans

Sometimes, during result-heavy LE scans, the UART byte stream can become
corrupted, leading to assertions caused by mis-interpreting the bytes
following the corruption.

This workaround looks for tell-tale signs of a BLE event and attempts to
skip the correct amount of bytes in the stream to re-synchronize onto a
packet boundary.

Bug: 23934838
Change-Id: Ifadaecf8077cb1defc7134c59c97302fca660f81

8 years agoRemove absolute volume control whitelist
Andre Eisenbach [Mon, 19 Oct 2015 23:06:20 +0000 (16:06 -0700)]
Remove absolute volume control whitelist

Remove the absolute volume control whitelist to enable absolute volume
control for all compatible devices.

Bug: 25081918
Change-Id: Iab0e4b4c4fd3dac0fefdf62ec80419dd64b56c0c

8 years agoFix 128-bit UUID byte order for GATT-over-BR/EDR
Andre Eisenbach [Wed, 21 Oct 2015 01:03:30 +0000 (18:03 -0700)]
Fix 128-bit UUID byte order for GATT-over-BR/EDR

128-bit UUIDs for GATT services discovered using SDP are byte-ordered
incorrectly. This patch fixes both the SDP discovery as well as the SDP
record creation code.

Bug: 24344122
Change-Id: Iee4bf33dcbbc5ee0f2380b48330107232bd0401b

8 years agodoc: add supported features document
Scott James Remnant [Tue, 20 Oct 2015 23:11:48 +0000 (23:11 +0000)]
doc: add supported features document
am: ac43e88a0a

* commit 'ac43e88a0aa375e712683e2b218d876c616e6f5e':
  doc: add supported features document

8 years agodoc: add supported features document
Scott James Remnant [Tue, 20 Oct 2015 22:54:06 +0000 (15:54 -0700)]
doc: add supported features document

Summarize the versions and roles of each profile/protocol listed
in our Qualified Design, and provide a link to the QDID.

Change-Id: I8cfbbd466c684cb95de5433b3d7fa0f1fd567689

8 years agoDO NOT MERGE Revert "am b3ca1b37: resolved conflicts for merge of a905eb62 to mnc...
Sharvil Nanavati [Fri, 4 Sep 2015 09:06:45 +0000 (02:06 -0700)]
DO NOT MERGE Revert "am b3ca1b37: resolved conflicts for merge of a905eb62 to mnc-dr-dev-plus-aosp"

This reverts commit 2f86b2fc188edb0ba50483e624bd982a594c6633, reversing
changes made to 15c3ad9c08b864f63ed2581a10a65107fbe04752.

Change-Id: I43500eb0513180db8ba5b4ecc9f2dec934173c7f

8 years agoDO NOT MERGE fix am error for 1dffda3b
Scott James Remnant [Tue, 20 Oct 2015 01:46:48 +0000 (18:46 -0700)]
DO NOT MERGE fix am error for 1dffda3b

Change-Id: Ic11a786ccf99ae50178b906f2163500c3af55612

8 years agoDO NOT MERGE Revert "DO NOT MERGE Use POSIX timer API for wake alarms instead of...
Scott James Remnant [Mon, 19 Oct 2015 17:48:06 +0000 (10:48 -0700)]
DO NOT MERGE Revert "DO NOT MERGE Use POSIX timer API for wake alarms instead of OSI callouts."

Also reverts:
  "Fix build: use unsigned long long in arithmetic expression."
  "Fix build: add LOG_TAG parameter to LOG_* macros."

These CLs cause build failures on various platforms, an alternate
approach is being developed.

8 years agoCorrect project name in Style Guide
Scott James Remnant [Tue, 20 Oct 2015 01:30:36 +0000 (01:30 +0000)]
Correct project name in Style Guide
am: d20656568b

* commit 'd20656568beb2f3d1a6528771e6ac463ca92364c':
  Correct project name in Style Guide

8 years agoResolve merge resolution differences between branches
Scott James Remnant [Tue, 20 Oct 2015 01:30:28 +0000 (01:30 +0000)]
Resolve merge resolution differences between branches
am: 02a29284a2  -s ours

* commit '02a29284a26a9d63210865ae9f086c0ad730ca78':
  Resolve merge resolution differences between branches

8 years agoCorrect project name in Style Guide
Scott James Remnant [Tue, 20 Oct 2015 01:02:03 +0000 (18:02 -0700)]
Correct project name in Style Guide

Change-Id: I07f41629b06820b85bf95ca255c68fc2ea78217a

8 years agoResolve merge resolution differences between branches
Scott James Remnant [Mon, 19 Oct 2015 23:23:28 +0000 (16:23 -0700)]
Resolve merge resolution differences between branches

Change-Id: I7b2f5bcf3a43aacdfbb740589ca1538ade149473

8 years agoam 36d0e2b9: Add Flic smart button to interop database
Andre Eisenbach [Mon, 19 Oct 2015 21:09:10 +0000 (14:09 -0700)]
am 36d0e2b9: Add Flic smart button to interop database

* commit '36d0e2b97be8b04d6607e9c1d76bbd2c9c891305':
  Add Flic smart button to interop database

8 years agoam 1946f251: Add missing LOG_TAG as the first argument to LOG_ERROR()
Pavlin Radoslavov [Mon, 19 Oct 2015 21:09:10 +0000 (14:09 -0700)]
am 1946f251: Add missing LOG_TAG as the first argument to LOG_ERROR()

* commit '1946f2516f5d1384ea7d25bb87d019c1875ae7f0':
  Add missing LOG_TAG as the first argument to LOG_ERROR()

8 years agoam 577862e0: Update the usage of fixed_queue.
Pavlin Radoslavov [Mon, 19 Oct 2015 21:09:09 +0000 (14:09 -0700)]
am 577862e0: Update the usage of fixed_queue.

* commit '577862e0d87891164a469afcecd1135bf04d1f6e':
  Update the usage of fixed_queue.

8 years agoresolved conflicts for 5b9b1b89 to stage-aosp-master
Scott James Remnant [Mon, 19 Oct 2015 21:05:46 +0000 (14:05 -0700)]
resolved conflicts for 5b9b1b89 to stage-aosp-master

Change-Id: I26781a825590a9effbc7d622391775b2eca58902

8 years agoam e29c3430: GKI cleanup - removed PORT_SCHEDULE_LOCK / UNLOCK macros
Pavlin Radoslavov [Mon, 19 Oct 2015 20:33:18 +0000 (13:33 -0700)]
am e29c3430: GKI cleanup - removed PORT_SCHEDULE_LOCK / UNLOCK macros

* commit 'e29c3430bfee2d92ba09c3cb4780a577ffc90712':
  GKI cleanup - removed PORT_SCHEDULE_LOCK / UNLOCK macros

8 years agoam 258c2538: GKI cleanup - moved GKI buffer allocation wrappers to OSI
Pavlin Radoslavov [Mon, 19 Oct 2015 20:33:17 +0000 (13:33 -0700)]
am 258c2538: GKI cleanup - moved GKI buffer allocation wrappers to OSI

* commit '258c2538e3b62a8cdb403f2730c45d721e5292b4':
  GKI cleanup - moved GKI buffer allocation wrappers to OSI

8 years agoam 9f1c9ad8: GKI cleanup - Moved struct TIMER_LIST_ENT to OSI
Pavlin Radoslavov [Mon, 19 Oct 2015 20:33:17 +0000 (13:33 -0700)]
am 9f1c9ad8: GKI cleanup - Moved struct TIMER_LIST_ENT to OSI

* commit '9f1c9ad85759c7663e3bbc494f8e75b2f107da67':
  GKI cleanup - Moved struct TIMER_LIST_ENT to OSI

8 years agoam 1a3844f9: GKI cleanup - Replaced usage of GKI queue with OSI fixed_queue
Pavlin Radoslavov [Mon, 19 Oct 2015 20:33:16 +0000 (13:33 -0700)]
am 1a3844f9: GKI cleanup - Replaced usage of GKI queue with OSI fixed_queue

* commit '1a3844f933bd63c8a381371dabfb35c6a0249e3e':
  GKI cleanup - Replaced usage of GKI queue with OSI fixed_queue

8 years agoam 1eb1ea0c: GKI cleanup - Moved functions GKI_disable() and GKI_enable() to OSI
Pavlin Radoslavov [Mon, 19 Oct 2015 20:33:15 +0000 (13:33 -0700)]
am 1eb1ea0c: GKI cleanup - Moved functions GKI_disable() and GKI_enable() to OSI

* commit '1eb1ea0cf2da992a3193506806e571dcbe3ec947':
  GKI cleanup - Moved functions GKI_disable() and GKI_enable() to OSI

8 years agoresolved conflicts for c196f214 to stage-aosp-master
Pavlin Radoslavov [Mon, 19 Oct 2015 20:24:32 +0000 (13:24 -0700)]
resolved conflicts for c196f214 to stage-aosp-master

Change-Id: I3c8acd59271180d5c11760d08ea960bb90040a8e

8 years agoam 89ba148d: Disable opening network debug ports for security reasons
Pavlin Radoslavov [Mon, 19 Oct 2015 19:55:07 +0000 (12:55 -0700)]
am 89ba148d: Disable opening network debug ports for security reasons

* commit '89ba148d2e19e6633318dd2d9a04bd2728281c30':
  Disable opening network debug ports for security reasons

8 years agoresolved conflicts for 2181f1a4 to stage-aosp-master
Scott James Remnant [Mon, 19 Oct 2015 19:21:22 +0000 (12:21 -0700)]
resolved conflicts for 2181f1a4 to stage-aosp-master

Change-Id: Ie6dd56d2605e732f9f9e08269d361288bb888874

8 years agoam 70ae7de9: GKI cleanup - Remove GKI pool related defines
Pavlin Radoslavov [Mon, 19 Oct 2015 19:10:39 +0000 (12:10 -0700)]
am 70ae7de9: GKI cleanup - Remove GKI pool related defines

* commit '70ae7de9451e3dc074a048ba98b672a6ba3a4551':
  GKI cleanup - Remove GKI pool related defines

8 years agoam 1d5b8592: GKI cleanup - Eliminate function GKI_get_pool_bufsize()
Pavlin Radoslavov [Mon, 19 Oct 2015 19:10:38 +0000 (12:10 -0700)]
am 1d5b8592: GKI cleanup - Eliminate function GKI_get_pool_bufsize()

* commit '1d5b85924df3a114efe6588e857d0de3eb47b1d2':
  GKI cleanup - Eliminate function GKI_get_pool_bufsize()

8 years agoam 21cce2ec: GKI cleanup - Eliminated function GKI_poolcount
Pavlin Radoslavov [Mon, 19 Oct 2015 19:10:38 +0000 (12:10 -0700)]
am 21cce2ec: GKI cleanup - Eliminated function GKI_poolcount

* commit '21cce2ecb75265845e7b24f2cde11e104b074838':
  GKI cleanup - Eliminated function GKI_poolcount

8 years agoam 2e3d006b: GKI cleanup - Eliminate usage of pool buffers
Pavlin Radoslavov [Mon, 19 Oct 2015 19:10:37 +0000 (12:10 -0700)]
am 2e3d006b: GKI cleanup - Eliminate usage of pool buffers

* commit '2e3d006b96eafb0651fe7f78d28250faf89405de':
  GKI cleanup - Eliminate usage of pool buffers

8 years agoam 6b24485c: Fix PAN and AV role switch war
tturney [Mon, 19 Oct 2015 19:10:37 +0000 (12:10 -0700)]
am 6b24485c: Fix PAN and AV role switch war

* commit '6b24485cec18ea111b05bc23f61d9c3f6a6b8747':
  Fix PAN and AV role switch war

8 years agoam 410970f2: Ensure thread priority is raised for media task / UIPC
Andre Eisenbach [Mon, 19 Oct 2015 19:10:37 +0000 (12:10 -0700)]
am 410970f2: Ensure thread priority is raised for media task / UIPC

* commit '410970f285ff34e6f1952dec2202825d890c3a0d':
  Ensure thread priority is raised for media task / UIPC

8 years agoam 8c24123f: Change UHID socket to be non-blocking
Andre Eisenbach [Mon, 19 Oct 2015 19:10:36 +0000 (12:10 -0700)]
am 8c24123f: Change UHID socket to be non-blocking

* commit '8c24123f9897991d228865c7eec35e33569e46bb':
  Change UHID socket to be non-blocking

8 years agoam 7f2eed69: Check BR device count before initiating role switch
Nitin Shivpure [Mon, 19 Oct 2015 19:10:36 +0000 (12:10 -0700)]
am 7f2eed69: Check BR device count before initiating role switch

* commit '7f2eed693f328843ed912144ed6ffcab0f2e3e75':
  Check BR device count before initiating role switch

8 years agoam 642f2330: GKI cleanup - Eliminated function GKI_delay
Pavlin Radoslavov [Mon, 19 Oct 2015 19:10:35 +0000 (12:10 -0700)]
am 642f2330: GKI cleanup - Eliminated function GKI_delay

* commit '642f233005cdcbbbcb92b77d6297fc080b7f072e':
  GKI cleanup - Eliminated function GKI_delay

8 years agoam de86bfa2: Add libpower as a dependency to all device targets that include libosi.
Sharvil Nanavati [Mon, 19 Oct 2015 19:10:35 +0000 (12:10 -0700)]
am de86bfa2: Add libpower as a dependency to all device targets that include libosi.

* commit 'de86bfa27b3ae6a9812788efe2b76fa3e7931d56':
  Add libpower as a dependency to all device targets that include libosi.

8 years agoam 20a1555a: Allow BT inquiry while discovery is in progress.
tturney [Mon, 19 Oct 2015 19:10:34 +0000 (12:10 -0700)]
am 20a1555a: Allow BT inquiry while discovery is in progress.

* commit '20a1555a0665efaab69ff25b3e7842d5f6c110c8':
  Allow BT inquiry while discovery is in progress.

8 years agoam 7b4fdb40: Eliminate recursive calling when handling GATT related errors
Pavlin Radoslavov [Mon, 19 Oct 2015 19:10:34 +0000 (12:10 -0700)]
am 7b4fdb40: Eliminate recursive calling when handling GATT related errors

* commit '7b4fdb40e81a68d254f6bf7cefbc385d978fb9d0':
  Eliminate recursive calling when handling GATT related errors

8 years agoam aafe557b: Fix issue where bluesleep idle timer is not started
wang ping [Mon, 19 Oct 2015 19:10:33 +0000 (12:10 -0700)]
am aafe557b: Fix issue where bluesleep idle timer is not started

* commit 'aafe557b56f2fb97a9d96a86bef8b4d6886cc6b3':
  Fix issue where bluesleep idle timer is not started

8 years agoam 530f7727: Fix btwrite timer timeout for Angler (2/2)
tturney [Mon, 19 Oct 2015 19:10:33 +0000 (12:10 -0700)]
am 530f7727: Fix btwrite timer timeout for Angler (2/2)

* commit '530f7727badf163705eb9638533f5af5d89fcacf':
  Fix btwrite timer timeout for Angler (2/2)

8 years agoam 9d0965c9: Implementation of net_test_bluedroid as a GTest.
Joshua Schwarz [Mon, 19 Oct 2015 19:10:32 +0000 (12:10 -0700)]
am 9d0965c9: Implementation of net_test_bluedroid as a GTest.

* commit '9d0965c9c9aaeac3dbb3b1ba5f76b3d9010f3eaa':
  Implementation of net_test_bluedroid as a GTest.

8 years agoam fda32d91: LE Multi-Advertising State Change Sub-event Wrong Variable Type
Jacob Lee [Mon, 19 Oct 2015 19:10:32 +0000 (12:10 -0700)]
am fda32d91: LE Multi-Advertising State Change Sub-event Wrong Variable Type

* commit 'fda32d91ec7f5a2e04464d19a6e57cddbe81c2e7':
  LE Multi-Advertising State Change Sub-event Wrong Variable Type

8 years agoam 4602429d: Fix incorrect SetConnScanParam function mapping
Sunny Kapdi [Mon, 19 Oct 2015 19:10:31 +0000 (12:10 -0700)]
am 4602429d: Fix incorrect SetConnScanParam function mapping

* commit '4602429dbcf5a5d6076f65450354be4db9f0f114':
  Fix incorrect SetConnScanParam function mapping

8 years agoam 11026214: Enable clang compilation.
Chih-Hung Hsieh [Mon, 19 Oct 2015 19:10:31 +0000 (12:10 -0700)]
am 11026214: Enable clang compilation.

* commit '110262140c4ab383a27d19c08e33f5937bd09c11':
  Enable clang compilation.

8 years agoam 3858011b: Send current RPA instead of pseudo-address on connect.
Sharvil Nanavati [Mon, 19 Oct 2015 19:10:31 +0000 (12:10 -0700)]
am 3858011b: Send current RPA instead of pseudo-address on connect.

* commit '3858011befbf62ac8c38af1493d9c61d43f999da':
  Send current RPA instead of pseudo-address on connect.

8 years agoam f34d336a: (-s ours) A2DP audio HAL: implement out_get_presentation_position()
Eric Laurent [Mon, 19 Oct 2015 19:10:30 +0000 (12:10 -0700)]
am f34d336a: (-s ours) A2DP audio HAL: implement out_get_presentation_position()

* commit 'f34d336a16a6788f667355b70a4d53b1325a25ed':
  A2DP audio HAL: implement out_get_presentation_position()

8 years agoam 28f294b9: Load factory Bluetooth address from system property
Ajay Panicker [Mon, 19 Oct 2015 19:03:02 +0000 (12:03 -0700)]
am 28f294b9: Load factory Bluetooth address from system property

* commit '28f294b94f6e05f4572672671535f66bb60f0c0a':
  Load factory Bluetooth address from system property

8 years agoam 6a42cbdb: Add a SCO routing command to net_hci.
Sharvil Nanavati [Mon, 19 Oct 2015 19:03:02 +0000 (12:03 -0700)]
am 6a42cbdb: Add a SCO routing command to net_hci.

* commit '6a42cbdb53d856a364a0c0fac28a732b55bc1cd9':
  Add a SCO routing command to net_hci.

8 years agoam 2af0bb6e: Fix merge discrepencies and resulting compile errors
Andre Eisenbach [Mon, 19 Oct 2015 19:03:01 +0000 (12:03 -0700)]
am 2af0bb6e: Fix merge discrepencies and resulting compile errors

* commit '2af0bb6e5f6b380f374d510c54eabdf74c32bdf2':
  Fix merge discrepencies and resulting compile errors

8 years agoAdd Flic smart button to interop database
Andre Eisenbach [Mon, 5 Oct 2015 20:25:14 +0000 (13:25 -0700)]
Add Flic smart button to interop database

Bug: 24737963
Change-Id: If3b59437439305b490c5fc260a7080cee04f09c5

8 years agoAdd missing LOG_TAG as the first argument to LOG_ERROR()
Pavlin Radoslavov [Thu, 8 Oct 2015 16:52:11 +0000 (09:52 -0700)]
Add missing LOG_TAG as the first argument to LOG_ERROR()

NOTE: This fix is needed as a side-effect of code merged
from different branches.

Change-Id: I1d25e719605d75899253732bd3d10ca0b552d244

8 years agoUpdate the usage of fixed_queue.
Pavlin Radoslavov [Thu, 8 Oct 2015 01:07:48 +0000 (18:07 -0700)]
Update the usage of fixed_queue.

 * Relax non-NULL requirements for fixed_queue by eliminating
   some of the asserts.
   Now, when semantically possible, fixed_queue - related function
   will return the appropriate value even if the queue pointer is NULL.
   This reduces clutter in the code where we had to do anyway
   "if (queue != NULL)" checks.

 * Add non-NULL guards in the few remaining places where
   fixed_queue_get_list(). For now, we need to use this function,
   hence the extra check.
   That function should be eliminated in the future, because all the
   code where it is used violates the semantics of using a queue.

Bug: 24723840
Change-Id: I47632a3515f3d27856d4870e18723d345c040d64

8 years agoRaise BTU and HCI thread priorities
Andre Eisenbach [Wed, 7 Oct 2015 18:16:37 +0000 (11:16 -0700)]
Raise BTU and HCI thread priorities

The audio sub-system and audio related tasks run at elevated thread
priorities in order to ensure timely handling of audio packets. This
patch raises the thread priority of lower layer Bluetooth tasks involved
in delivering audio packets to avoid thread pre-emption and subsequent
audio skipping.

Bug: 24570959
Change-Id: I5e19ee4590207df753f7b8bfc22174959722ec2d