OSDN Git Service

android-x86/system-bt.git
8 years agoservice: use client_id instead of client_if
Jakub Pawlowski [Wed, 13 Jan 2016 18:46:24 +0000 (18:46 +0000)]
service: use client_id instead of client_if
am: 6d596c0729

* commit '6d596c072995a876414b55a0471ef13146053b9c':
  service: use client_id instead of client_if

8 years agoservice: use client_id instead of client_if
Jakub Pawlowski [Wed, 13 Jan 2016 18:19:34 +0000 (10:19 -0800)]
service: use client_id instead of client_if

Change-Id: Id045c81f748c99ab0525ce8869ef9cdd0207712e

8 years agoMerge "service: Rename variable holding advertisement settings"
Jakub Pawlowski [Tue, 12 Jan 2016 23:03:25 +0000 (23:03 +0000)]
Merge "service: Rename variable holding advertisement settings"
am: 8b3e3ed3d9

* commit '8b3e3ed3d9f9bc12c3ffeb380ca68ed3b5852ef6':
  service: Rename variable holding advertisement settings

8 years agoMerge "service: Rename variable holding advertisement settings"
Jakub Pawlowski [Tue, 12 Jan 2016 22:58:03 +0000 (22:58 +0000)]
Merge "service: Rename variable holding advertisement settings"

8 years agoservice: Rename variable holding advertisement settings
Jakub Pawlowski [Tue, 12 Jan 2016 21:43:33 +0000 (13:43 -0800)]
service: Rename variable holding advertisement settings

There will be more variables with settings. Make sure they
all have unique meaningful names.

Change-Id: I4b23fd3fa5a16f9132801b9141e4f8ed0be33be7

8 years agoMerge "Additional headsets blacklisted for absolute volume"
Andre Eisenbach [Tue, 12 Jan 2016 19:49:19 +0000 (19:49 +0000)]
Merge "Additional headsets blacklisted for absolute volume"
am: 7632bee5a5

* commit '7632bee5a5a5ee501efe188f36a05dd830842072':
  Additional headsets blacklisted for absolute volume

8 years agoMerge "Additional headsets blacklisted for absolute volume"
Andre Eisenbach [Tue, 12 Jan 2016 19:31:12 +0000 (19:31 +0000)]
Merge "Additional headsets blacklisted for absolute volume"

8 years agoservice: Make Adapter mockable.
Arman Uguray [Tue, 12 Jan 2016 18:56:45 +0000 (18:56 +0000)]
service: Make Adapter mockable.
am: 0a0d393213

* commit '0a0d3932136995a722cc125ef920679113d8ce0f':
  service: Make Adapter mockable.

8 years agoservice: Make Adapter mockable.
Arman Uguray [Thu, 19 Nov 2015 23:57:57 +0000 (15:57 -0800)]
service: Make Adapter mockable.

Turned the Adapter class into an abstract interface so that we
can inject a mock Adapter in tests where there is an Adapter dependency
but where we don't care about side-effects/stack-calls created from the
Adapter.

Bug: 25744656

Change-Id: Ibf7dd9a4cc1008cbb36e60f7b87cfcb4ef2bd5d8

8 years agoAdditional headsets blacklisted for absolute volume
Andre Eisenbach [Tue, 12 Jan 2016 02:06:44 +0000 (18:06 -0800)]
Additional headsets blacklisted for absolute volume

Bug: 26070064
Change-Id: Ida1faec964982a4630f42ab378fe5b6dd6e21c16

8 years agoAssert on memory allocation failure
Andre Eisenbach [Mon, 11 Jan 2016 22:25:45 +0000 (22:25 +0000)]
Assert on memory allocation failure
am: c02acb7761

* commit 'c02acb7761d2539ab83c6eff22b7de5b5da51b78':
  Assert on memory allocation failure

8 years agoAssert on memory allocation failure
Andre Eisenbach [Mon, 11 Jan 2016 20:24:14 +0000 (12:24 -0800)]
Assert on memory allocation failure

This CL is a pre-cursor to cleaning up repeated memory allocation code
full of null-pointer checks. In the vast majority of cases in the
Bluetooth stack, a failed allocation is not recoverable and results in
undefined behaviour. By asserting, we can ensure we have a shot at
catching and fixing any issues not caused by OOM conditions.

Bug: 26494317
Change-Id: I53dff98c596068211934a1808f90de2d4484f952

8 years agoMerge "service: Add global scan support getters"
Jakub Pawlowski [Mon, 11 Jan 2016 22:19:45 +0000 (22:19 +0000)]
Merge "service: Add global scan support getters"
am: 9f41ecbcb4

* commit '9f41ecbcb4a89ce64dbf1f046501ed78931b6db3':
  service: Add global scan support getters

8 years agoMerge "service: Add global scan support getters"
Jakub Pawlowski [Mon, 11 Jan 2016 22:15:47 +0000 (22:15 +0000)]
Merge "service: Add global scan support getters"

8 years agoImplement OOB pairing for LE devices using TK.
Jakub Pawlowski [Thu, 7 Jan 2016 23:36:23 +0000 (23:36 +0000)]
Implement OOB pairing for LE devices using TK.
am: 1a5bb5f303

* commit '1a5bb5f30385af44d11ffba10e0f5af79f0ae422':
  Implement OOB pairing for LE devices using TK.

8 years agoImplement OOB pairing for LE devices using TK.
Jakub Pawlowski [Tue, 1 Dec 2015 20:14:22 +0000 (12:14 -0800)]
Implement OOB pairing for LE devices using TK.

This patch implements OOB pairing for LE devices using TK. Patches
for other pairing methods, and other transports will follow.

Bug: 22932952
Change-Id: Iad3c0c035de3b5a62ef24d3e3b655773fa03d5c1

8 years agoAdd script to change data types to native C types
Andre Eisenbach [Thu, 7 Jan 2016 22:24:54 +0000 (22:24 +0000)]
Add script to change data types to native C types
am: 86b76c6241

* commit '86b76c6241ec2b0af06ab93300cfc51a5865021d':
  Add script to change data types to native C types

8 years agoAdd script to change data types to native C types
Andre Eisenbach [Wed, 30 Dec 2015 01:49:01 +0000 (17:49 -0800)]
Add script to change data types to native C types

Please see source code for usage information and application.

Bug: 22948224
Change-Id: Ia2dbd618ddcdf13abf3c63d4649147f400e00cfe

8 years agoA2DP task media alarm non-null protection
Ajay Panicker [Thu, 7 Jan 2016 22:09:10 +0000 (22:09 +0000)]
A2DP task media alarm non-null protection
am: e04dbb3707

* commit 'e04dbb3707806be965f5669d3213263c0178ef26':
  A2DP task media alarm non-null protection

8 years agoA2DP task media alarm non-null protection
Ajay Panicker [Wed, 6 Jan 2016 20:11:05 +0000 (12:11 -0800)]
A2DP task media alarm non-null protection

Prevent the alarm from being started multiple times.

Bug: 26277592
Change-Id: I764f93bab5490bf5f3942a1beb706457197d3ec1

8 years agonet_test_bluetooth: fix inconsistency in set/get name test
Ajay Panicker [Wed, 6 Jan 2016 18:47:43 +0000 (18:47 +0000)]
net_test_bluetooth: fix inconsistency in set/get name test
am: 19cd152d2f

* commit '19cd152d2fcf441b069672adbed517ec920f419c':
  net_test_bluetooth: fix inconsistency in set/get name test

8 years agonet_test_bluetooth: fix inconsistency in set/get name test
Ajay Panicker [Tue, 5 Jan 2016 23:03:19 +0000 (15:03 -0800)]
net_test_bluetooth: fix inconsistency in set/get name test

Fixed an issue where the set/get name test would fail every so often
due to the fact that the old name property would become invalid after
the properties array was freed.

Bug: 25793348
Change-Id: I4513219da2fb947b3b199f25a61c308b9fced8b6

8 years agoFix bug where a bonded device could enter BONDING and BONDED states again.
Sharvil Nanavati [Wed, 6 Jan 2016 18:02:26 +0000 (18:02 +0000)]
Fix bug where a bonded device could enter BONDING and BONDED states again.
am: 0b7fc58908

* commit '0b7fc589089ce4a96daa668b9d293ce01982424d':
  Fix bug where a bonded device could enter BONDING and BONDED states again.

8 years agoFix bug where a bonded device could enter BONDING and BONDED states again.
Sharvil Nanavati [Wed, 6 Jan 2016 00:23:02 +0000 (16:23 -0800)]
Fix bug where a bonded device could enter BONDING and BONDED states again.

The following sequence of events was observed:
- start bonding with device A
- bond state for A goes from 10 -> 11 -> 12
- everyone's happy
- start bonding with device B
- bond state for B goes from 10 -> 11
- bond state for A goes from 12 -> 11 -> 12

The bond state for A should not have been changed in the last step
since it was not participating in any bonding procedure at the time.

The above sequence can be reproduced if a device D bonds with
A and takes on the slave role and then D bonds with B and switches
to a master role. When D performs the role switch, it receives an
updated link key from A.

Since the link key update procedure is tied in with the pairing flow,
we see spurious bond state changes. This CL checks the pairing control
block to see if D is, in fact, pairing with A and if not, it skips the
bond state updates.

Bug: 25870383
Change-Id: Ic6ff548dbe4e960c965bdc9ef5c50a263b9b3b22

8 years agoBluetooth: Remove std=c++11
Andreas Gampe [Wed, 6 Jan 2016 00:40:47 +0000 (00:40 +0000)]
Bluetooth: Remove std=c++11
am: 32579680eb

* commit '32579680eb9c52fa58b3eb7e3fd8a7de8f264983':
  Bluetooth: Remove std=c++11

8 years agoBluetooth: Remove std=c++11
Andreas Gampe [Wed, 6 Jan 2016 00:29:05 +0000 (16:29 -0800)]
Bluetooth: Remove std=c++11

It's the default now.

Change-Id: Ice463e6e74d56bffd00a80824721dbe57241ea06

8 years agoMerge "Bluetooth: Silence unused-parameter warning"
Andreas Gampe [Tue, 5 Jan 2016 22:14:23 +0000 (22:14 +0000)]
Merge "Bluetooth: Silence unused-parameter warning"
am: 9a7624c052

* commit '9a7624c05228aafd3933eec73baf5a64d3b76f63':
  Bluetooth: Silence unused-parameter warning

8 years agoMerge "Bluetooth: Silence unused-parameter warning"
Andreas Gampe [Tue, 5 Jan 2016 22:10:20 +0000 (22:10 +0000)]
Merge "Bluetooth: Silence unused-parameter warning"

8 years agoBluetooth: Silence unused-parameter warning
Andreas Gampe [Tue, 5 Jan 2016 21:52:00 +0000 (13:52 -0800)]
Bluetooth: Silence unused-parameter warning

Silence these for now. Reduce build noise.

Change-Id: I787c31f60c8d24e3dd2bae8d1acaa7592b7e29ba

8 years agoMerge "Fix absolute volume reporting if AVRC_ADV_CTRL_INCLUDED is false"
Sharvil Nanavati [Tue, 5 Jan 2016 18:06:25 +0000 (18:06 +0000)]
Merge "Fix absolute volume reporting if AVRC_ADV_CTRL_INCLUDED is false"
am: c0231ad1f9

* commit 'c0231ad1f96ac76cf31db0afde550bfc10b6ac7a':
  Fix absolute volume reporting if AVRC_ADV_CTRL_INCLUDED is false

8 years agoMerge "Fix absolute volume reporting if AVRC_ADV_CTRL_INCLUDED is false"
Sharvil Nanavati [Tue, 5 Jan 2016 18:01:59 +0000 (18:01 +0000)]
Merge "Fix absolute volume reporting if AVRC_ADV_CTRL_INCLUDED is false"

8 years agoMerge "Fix crash in HFP client\'s +COPS parsing code."
Sharvil Nanavati [Tue, 5 Jan 2016 17:02:29 +0000 (17:02 +0000)]
Merge "Fix crash in HFP client\'s +COPS parsing code."
am: 83702c9ac1

* commit '83702c9ac1c825161e1163cbfb238215a076abd5':
  Fix crash in HFP client's +COPS parsing code.

8 years agoOnly send first 16 characters of operator name in +COPS.
Sharvil Nanavati [Tue, 5 Jan 2016 17:02:21 +0000 (17:02 +0000)]
Only send first 16 characters of operator name in +COPS.
am: a459df848e

* commit 'a459df848e03b0f2fb3f15d54404b48b94cff560':
  Only send first 16 characters of operator name in +COPS.

8 years agoMerge "Fix crash in HFP client's +COPS parsing code."
Sharvil Nanavati [Tue, 5 Jan 2016 16:58:05 +0000 (16:58 +0000)]
Merge "Fix crash in HFP client's +COPS parsing code."

8 years agoFix absolute volume reporting if AVRC_ADV_CTRL_INCLUDED is false
Sharvil Nanavati [Thu, 17 Dec 2015 14:23:19 +0000 (06:23 -0800)]
Fix absolute volume reporting if AVRC_ADV_CTRL_INCLUDED is false

Without this change, setting AVRC_ADV_CTRL_INCLUDED to false would
result in the native code reporting the remote device supports
absolute volume even though we don't.

Bug: 26070064
Change-Id: I5b88fa0adb89983de28a216898a1d8957fa454a1

8 years agoFix crash in HFP client's +COPS parsing code.
Sharvil Nanavati [Tue, 5 Jan 2016 01:21:05 +0000 (17:21 -0800)]
Fix crash in HFP client's +COPS parsing code.

If the Audio Gateway sends a malformed +COPS message (an operator
name > 16 characters) then the %n in sscanf format specifier is
ignored and sscanf will not assign a value to the appropriate
argument.

In such a case, the existing code will perform pointer arithmetic
using an uninitialized stack variable as an offset which may result
in pointing to an invalid memory address. When that memory is
subsequently dereferenced, we observe a crash.

This change ensures that the stack does not crash even if an invalid
+COPS message is sent from the Audio Gateway.

Bug: 24871011
Change-Id: I9bb42c75bcd90487831fc6950c571c87098559e7

8 years agoOnly send first 16 characters of operator name in +COPS.
Sharvil Nanavati [Tue, 5 Jan 2016 01:15:18 +0000 (17:15 -0800)]
Only send first 16 characters of operator name in +COPS.

According to the HFP spec, the operator name is required to be at
most 16 characters long.

Bug: 24871011
Change-Id: I9987de57a327348fc2203b9502e9df446a87793f

8 years agoFix RFCOMM Rx speed of transfer
Hemant Gupta [Wed, 30 Dec 2015 19:49:33 +0000 (19:49 +0000)]
Fix RFCOMM Rx speed of transfer
am: b2c46a4541

* commit 'b2c46a45410d6ecfa2b6df57fb81ee4b192e5455':
  Fix RFCOMM Rx speed of transfer

8 years agoFix RFCOMM Rx speed of transfer
Hemant Gupta [Thu, 27 Aug 2015 05:18:07 +0000 (10:48 +0530)]
Fix RFCOMM Rx speed of transfer

Use Case:
1. OPP Rx use case on the DUT Side
2. Transfer 10Mb+ of file from remote to DUT
3. Observe speeds over RFCOMM (expected 1.5Mbps+)

Failure:
Actual speeds lesser than 1.5Mbps

Root Cause:
Rx bottlenecks seen due to frequent timer operation
during incoming data on RFCOMM

Fix:
BUSY and IDLE states of BT Power manager are already
handled inside the stack and no need to explicitly set
IDLE and BUSY states from JV layer anymore.

Bug: 22487461
Change-Id: Icdc25c52103d6a849cc6e12656d9c69f5e152b05

8 years agoFix flaky AlarmTest.test_set_long_*
Marie Janssen [Wed, 30 Dec 2015 15:46:28 +0000 (15:46 +0000)]
Fix flaky AlarmTest.test_set_long_*
am: ac786e364a

* commit 'ac786e364a0ba90cbc8768068f98361fe4fe3f8a':
  Fix flaky AlarmTest.test_set_long_*

8 years agoFix flaky AlarmTest.test_set_long_*
Marie Janssen [Tue, 29 Dec 2015 23:34:55 +0000 (15:34 -0800)]
Fix flaky AlarmTest.test_set_long_*

The "long" tests need some leeway for the timer to be checked because
sometimes it takes ~1-2ms to check timers for wakelock scheduling.

Bug: 26140385
Change-Id: I362166f1d93a811f3933776294775b594226ab30

8 years agoUse GID "wakelock" to control access to kernel wakelock
Pavlin Radoslavov [Tue, 29 Dec 2015 01:28:21 +0000 (01:28 +0000)]
Use GID "wakelock" to control access to kernel wakelock
am: ec636244e2

* commit 'ec636244e297b456cae4247b3bfae120701bc35f':
  Use GID "wakelock" to control access to kernel wakelock

8 years agoUse GID "wakelock" to control access to kernel wakelock
Pavlin Radoslavov [Tue, 24 Nov 2015 01:16:29 +0000 (17:16 -0800)]
Use GID "wakelock" to control access to kernel wakelock

Bug: 25864142
Change-Id: I5103471b0ec28c26c18b891fc3be07c000067b4e

8 years agoUse GID "wakelock" to control access to kernel wakelock
Pavlin Radoslavov [Tue, 24 Nov 2015 01:16:29 +0000 (17:16 -0800)]
Use GID "wakelock" to control access to kernel wakelock

Bug: 25864142
Change-Id: I5103471b0ec28c26c18b891fc3be07c000067b4e

8 years agoMemory overwrite due to HDP doesn\'t allocate enough buffer am: 4d7575b601 am: ec14550ab5
Jacob Lee [Thu, 24 Dec 2015 02:23:25 +0000 (18:23 -0800)]
Memory overwrite due to HDP doesn\'t allocate enough buffer am: 4d7575b601 am: ec14550ab5
am: bf590c8a35

* commit 'bf590c8a35c03ec96653036073fa4f478163244d':

8 years agoReapply "Fix broken test caused by misordered callback arguments." am: ea01e8d0a3...
Sharvil Nanavati [Thu, 24 Dec 2015 02:23:22 +0000 (18:23 -0800)]
Reapply "Fix broken test caused by misordered callback arguments." am: ea01e8d0a3 am: 85b03e446c
am: 58b661622e

* commit '58b661622e91d82393f05c517bb42e3389d3ceaa':

8 years agoUse aosp/master version of bdd19e08 am: 9ecdf9c0c4
Scott James Remnant [Thu, 24 Dec 2015 02:23:18 +0000 (18:23 -0800)]
Use aosp/master version of bdd19e08 am: 9ecdf9c0c4
am: c3b473810b

* commit 'c3b473810b8d66c5a0631fcc8bd3d4122539dbe5':

8 years agoPrevent integer overflows during GATT signing am: c8fd18625f am: 7da957c2c0
Ajay Panicker [Thu, 24 Dec 2015 02:23:15 +0000 (18:23 -0800)]
Prevent integer overflows during GATT signing am: c8fd18625f am: 7da957c2c0
am: 421b3820c7

* commit '421b3820c7e48596baecd501966fef915cd811aa':

8 years agoRaise alarm callback thread priority am: 41a91a52b0 am: ab6ec2bc93
Andre Eisenbach [Thu, 24 Dec 2015 02:23:12 +0000 (18:23 -0800)]
Raise alarm callback thread priority am: 41a91a52b0 am: ab6ec2bc93
am: eaeb9bd733

* commit 'eaeb9bd7337d71eaa762ce2fddd6be3f37fd1448':

8 years agoReduce persistence on aquiring master role am: 77e70b4b2d am: 752c1cd5bc
Mattias Agren [Thu, 24 Dec 2015 02:23:08 +0000 (18:23 -0800)]
Reduce persistence on aquiring master role am: 77e70b4b2d am: 752c1cd5bc
am: 05154ce772

* commit '05154ce772e55fdad71acd2c16b67e135bde4070':

8 years agoFix flaky EagerReaderTest.test_large_data_multibyte am: b74ef93233 am: 03b1e30775
Andre Eisenbach [Thu, 24 Dec 2015 02:19:25 +0000 (18:19 -0800)]
Fix flaky EagerReaderTest.test_large_data_multibyte am: b74ef93233 am: 03b1e30775
am: d51d89ad0d

* commit 'd51d89ad0dcc4e95114faf7aa5f55aae645cc959':

8 years agoPass unknown run_unit_tests long arguments to tests am: 6babef0456 am: bc2b435ab4
Scott James Remnant [Thu, 24 Dec 2015 02:12:22 +0000 (18:12 -0800)]
Pass unknown run_unit_tests long arguments to tests am: 6babef0456 am: bc2b435ab4
am: 9838419d81

* commit '9838419d814f1794a7313b5fd97a31a5f38ded0c':

8 years agoAdd test filter option to run_unit_tests am: 753c074b44 am: 138f65e659
Scott James Remnant [Thu, 24 Dec 2015 02:11:53 +0000 (18:11 -0800)]
Add test filter option to run_unit_tests am: 753c074b44 am: 138f65e659
am: 416eccf138

* commit '416eccf1384373be5e8d4b7869921fa92d25b4d1':

8 years agoGive run_unit_tests an exit code am: 0ff191abbf am: a3feca655c
Scott James Remnant [Thu, 24 Dec 2015 02:11:25 +0000 (18:11 -0800)]
Give run_unit_tests an exit code am: 0ff191abbf am: a3feca655c
am: 63bd7af038

* commit '63bd7af03836c8ed1f7b5b71babe40ff5388d3a4':

8 years agoservice/test: Reset command-line on SetUp am: 8531fc3571 am: 1c13443412
Arman Uguray [Thu, 24 Dec 2015 02:09:52 +0000 (18:09 -0800)]
service/test: Reset command-line on SetUp am: 8531fc3571 am: 1c13443412
am: 520a791707

* commit '520a7917073a9cfc32ae0d9d00dcdd8595b44393':

8 years agoAdd -s <specific device> to run_unit_tests am: 03e8be8b11 am: 5d384a505a
Scott James Remnant [Thu, 24 Dec 2015 02:09:09 +0000 (18:09 -0800)]
Add -s <specific device> to run_unit_tests am: 03e8be8b11 am: 5d384a505a
am: a464749aba

* commit 'a464749aba1fe10e57b947dbfcae9f560cb5805a':

8 years agoMerge "service/client: Add register|unregister-gatt" am: 6b881b1ff9 am: a269e0676d
Arman Uguray [Thu, 24 Dec 2015 02:08:11 +0000 (18:08 -0800)]
Merge "service/client: Add register|unregister-gatt" am: 6b881b1ff9 am: a269e0676d
am: 3cb26b7877

* commit '3cb26b78774f7c7eabe45e06900b258196f88d5f':

8 years agoMerge "service: Introduce bluetooth::GattClient" am: 3445e896b5 am: ecad06cb6c
Arman Uguray [Thu, 24 Dec 2015 02:08:07 +0000 (18:08 -0800)]
Merge "service: Introduce bluetooth::GattClient" am: 3445e896b5 am: ecad06cb6c
am: a69a95e950

* commit 'a69a95e95003f7513271439f71a5e33f450c56f0':

8 years agoMerge "service: Add IBluetoothGattClient IPC bindings" am: 3ee69e43c2 am: 83d02310c3
Arman Uguray [Thu, 24 Dec 2015 02:08:04 +0000 (18:08 -0800)]
Merge "service: Add IBluetoothGattClient IPC bindings" am: 3ee69e43c2 am: 83d02310c3
am: 1e1ab90ab1

* commit '1e1ab90ab150b42b3a1288313f22beb13550f0bc':

8 years agonet_test_bluetooth: replace with gtest variant am: e27d3133c2 am: a16a0266e4
Scott James Remnant [Thu, 24 Dec 2015 02:08:00 +0000 (18:08 -0800)]
net_test_bluetooth: replace with gtest variant am: e27d3133c2 am: a16a0266e4
am: 5f68c19c45

* commit '5f68c19c4512fa1bfb8dc99b1eae7046547eb586':

8 years agoFix SIGBUS crash when copying data am: 3f06e14fdd am: c4203a27fc
Pavlin Radoslavov [Thu, 24 Dec 2015 02:07:57 +0000 (18:07 -0800)]
Fix SIGBUS crash when copying data am: 3f06e14fdd am: c4203a27fc
am: 5c5547d738

* commit '5c5547d738d2f97390907919f480dccc3fe205f2':

8 years agoIndicate failed tests in run_unit_tests.sh am: 7ab59096c2 am: 08a960d795
Andre Eisenbach [Thu, 24 Dec 2015 02:07:54 +0000 (18:07 -0800)]
Indicate failed tests in run_unit_tests.sh am: 7ab59096c2 am: 08a960d795
am: 0a3f937949

* commit '0a3f93794972b291faad12570514b70da385e9b2':

8 years agoMerge "Retry HID Polling when EINTR is returned" am: 95e0c57578 am: 3d1d6595ec
Myles Watson [Thu, 24 Dec 2015 02:07:51 +0000 (18:07 -0800)]
Merge "Retry HID Polling when EINTR is returned" am: 95e0c57578 am: 3d1d6595ec
am: b161d37460

* commit 'b161d3746005b2d3f8496a43006d09b33d18bbc3':

8 years agoNull-terminate hex string in uuid_new() am: addbe8f489 am: 5f2c3d86d2
Ajay Panicker [Thu, 24 Dec 2015 02:07:47 +0000 (18:07 -0800)]
Null-terminate hex string in uuid_new() am: addbe8f489 am: 5f2c3d86d2
am: 18b5bd160b

* commit '18b5bd160be41a15c9b11b2807cf84de1a516418':

8 years agoFix net_test_hci am: b0f59256c6 am: 0005a705cc
Andre Eisenbach [Thu, 24 Dec 2015 02:07:44 +0000 (18:07 -0800)]
Fix net_test_hci am: b0f59256c6 am: 0005a705cc
am: 7df0b466a0

* commit '7df0b466a0e94128d3005e1c2ea23d91b164df2d':

8 years agoMerge "Fix broken test caused by misordered callback arguments." into cw-e-dev am...
Sharvil Nanavati [Thu, 24 Dec 2015 02:07:41 +0000 (18:07 -0800)]
Merge "Fix broken test caused by misordered callback arguments." into cw-e-dev am: bedd614381
am: 11fc54d2c9

* commit '11fc54d2c90d6036fd1647a1cc41a07f1eb40189':

8 years agoMerge "service/doc: Add Binder GATT client API definition" am: 88e68c2cd6 am: 6b0dadb3a3
Arman Uguray [Thu, 24 Dec 2015 02:07:38 +0000 (18:07 -0800)]
Merge "service/doc: Add Binder GATT client API definition" am: 88e68c2cd6 am: 6b0dadb3a3
am: ff65680624

* commit 'ff656806247f72c2509c32f1eda71231f7d1de5a':

8 years agoFix an error loading audio.a2dp.default.so library am: a3aed3bd53 am: 4402e3a447
Ajay Panicker [Thu, 24 Dec 2015 02:07:34 +0000 (18:07 -0800)]
Fix an error loading audio.a2dp.default.so library am: a3aed3bd53 am: 4402e3a447
am: 1e01259291

* commit '1e012592919e799d7408658951d0b1e1c0a20892':

8 years agoFix broken test caused by misordered callback arguments. am: 1b4c8b4ebb am: f5dee186f1
Sharvil Nanavati [Thu, 24 Dec 2015 02:07:31 +0000 (18:07 -0800)]
Fix broken test caused by misordered callback arguments. am: 1b4c8b4ebb am: f5dee186f1
am: 09a1c8a17c

* commit '09a1c8a17cbf02c3c1547bda79aead7c2514fe55':

8 years agoTreat empty/truncated GATT cache as error am: 1f656f15b1 am: 774defe11b
Andre Eisenbach [Thu, 24 Dec 2015 02:07:27 +0000 (18:07 -0800)]
Treat empty/truncated GATT cache as error am: 1f656f15b1 am: 774defe11b
am: c369239337

* commit 'c3692393378059a3abfebfdaf1982db659dc1011':

8 years agoAlways update remote address type during LE scan am: 7b9fe757f5 am: 5c5d572459
Andre Eisenbach [Thu, 24 Dec 2015 02:07:24 +0000 (18:07 -0800)]
Always update remote address type during LE scan am: 7b9fe757f5 am: 5c5d572459
am: a9517d17f3

* commit 'a9517d17f3b451c15a50cce894795b496ceaf36b':

8 years agoRemoved libpower-related references. am: 45a94e198e am: b8cde2c80d
Pavlin Radoslavov [Thu, 24 Dec 2015 02:07:21 +0000 (18:07 -0800)]
Removed libpower-related references. am: 45a94e198e am: b8cde2c80d
am: c935cdf7bf

* commit 'c935cdf7bf4ef21175cff473ab0380297875959b':

8 years agoAlways update remote address type during LE scan am: 03d171170c am: 02ddf25bd0
Andre Eisenbach [Thu, 24 Dec 2015 02:07:18 +0000 (18:07 -0800)]
Always update remote address type during LE scan am: 03d171170c am: 02ddf25bd0
am: 2de6e0fc1e

* commit '2de6e0fc1e537b95ec31ed8b200cdf80a00e32f4':

8 years agogn-build: Get net_test_bluetooth to compile am: 3e54b60e10 am: ee4744eed6
Marie Janssen [Thu, 24 Dec 2015 02:07:14 +0000 (18:07 -0800)]
gn-build: Get net_test_bluetooth to compile am: 3e54b60e10 am: ee4744eed6
am: 047c633004

* commit '047c63300491240f6f3359337bc198de99f23ccd':

8 years agoMerge "Do not mask out secure connections (SC) bit for BT <4.2" into mnc-dr-dev am...
Andre Eisenbach [Thu, 24 Dec 2015 02:07:11 +0000 (18:07 -0800)]
Merge "Do not mask out secure connections (SC) bit for BT <4.2" into mnc-dr-dev am: 15c1f685db am: 442e504115
am: 4560daf794

* commit '4560daf794a3820376d4953f05b4b9737e0d7aa7':

8 years agoFix bug in SDP 128-bit UUID lookup am: 7312c6d913 am: 50d8df7a33
Andre Eisenbach [Thu, 24 Dec 2015 02:07:08 +0000 (18:07 -0800)]
Fix bug in SDP 128-bit UUID lookup am: 7312c6d913 am: 50d8df7a33
am: 54e2c2be9a

* commit '54e2c2be9a68c8eef2995d239c41dddcbc2d17cf':

8 years agoFix bug in SDP 128-bit UUID lookup am: 526f3cc7e9 am: 1a1c20dd86
Andre Eisenbach [Thu, 24 Dec 2015 02:07:04 +0000 (18:07 -0800)]
Fix bug in SDP 128-bit UUID lookup am: 526f3cc7e9 am: 1a1c20dd86
am: ae11858a72

* commit 'ae11858a72c94cb60de0cb3c698eea2310ad45e6':

8 years agoDo not mask out secure connections (SC) bit for BT <4.2 am: 97305504e5 am: 5d30292aaa
Andre Eisenbach [Thu, 24 Dec 2015 02:07:01 +0000 (18:07 -0800)]
Do not mask out secure connections (SC) bit for BT <4.2 am: 97305504e5 am: 5d30292aaa
am: fc8839fad4

* commit 'fc8839fad4f5b29ed09bce99dbf1efad0f3838ab':

8 years agoMerge commit \'8b71f990de2b2ca9354726b56f0bd41bb9082ad3\' into HEAD am: abb36da490
Bill Yi [Thu, 24 Dec 2015 02:06:58 +0000 (18:06 -0800)]
Merge commit \'8b71f990de2b2ca9354726b56f0bd41bb9082ad3\' into HEAD am: abb36da490
am: b59bc16569

* commit 'b59bc1656929b3324844dd462a4b4f0067d381ae':

8 years agoMerge "Rename net_test_bluedroid to net_test_bluetooth" am: c2ad136c3e am: 028f32f35f
Andre Eisenbach [Thu, 24 Dec 2015 02:06:55 +0000 (18:06 -0800)]
Merge "Rename net_test_bluedroid to net_test_bluetooth" am: c2ad136c3e am: 028f32f35f
am: 65a55b1763

* commit '65a55b17638b0f88cdc5ba6b719a9dda6fb36500':

8 years agoFix interop database unit test am: f2a7e6c4eb am: da16e1c6a4
Andre Eisenbach [Thu, 24 Dec 2015 02:06:51 +0000 (18:06 -0800)]
Fix interop database unit test am: f2a7e6c4eb am: da16e1c6a4
am: 26d36ea465

* commit '26d36ea4651bcbd810b7d70a2d1011f411068ae9':

8 years agoMerge "Serialize remote version query over LE" am: a0a3dacd68 am: 65ba9b572b
Andre Eisenbach [Thu, 24 Dec 2015 02:06:48 +0000 (18:06 -0800)]
Merge "Serialize remote version query over LE" am: a0a3dacd68 am: 65ba9b572b
am: dc0bb24d1d

* commit 'dc0bb24d1d40ed23bf33bcf6d0db3d28ea357e33':

8 years agoRemove unused HCI_PROTO_REVISION am: 879aeec727 am: e7a14f9a7f
Andre Eisenbach [Thu, 24 Dec 2015 02:06:44 +0000 (18:06 -0800)]
Remove unused HCI_PROTO_REVISION am: 879aeec727 am: e7a14f9a7f
am: 6fad4e7234

* commit '6fad4e723449dfe3fb42e90d968028753474db62':

8 years agoSerialize remote version query over LE am: 864e7734f2 am: b2bf772af1
Andre Eisenbach [Thu, 24 Dec 2015 02:06:41 +0000 (18:06 -0800)]
Serialize remote version query over LE am: 864e7734f2 am: b2bf772af1
am: a5d20f2f3b

* commit 'a5d20f2f3b63297b22ba2f72bf078130fcf91a2a':

8 years agoCheck remote LMP version before enabling secure connections am: 4f7c4f6732 am: 406a266f13
Andre Eisenbach [Thu, 24 Dec 2015 02:06:36 +0000 (18:06 -0800)]
Check remote LMP version before enabling secure connections am: 4f7c4f6732 am: 406a266f13
am: bbcc5f4fb9

* commit 'bbcc5f4fb94cdfa7522162fa392fc2692de674ef':

8 years agoMerge "net_test_bluetooth: Improve set/get name logic"
Andre Eisenbach [Wed, 23 Dec 2015 03:25:20 +0000 (03:25 +0000)]
Merge "net_test_bluetooth: Improve set/get name logic"
am: da8680df37

* commit 'da8680df37ed3606b484cab11dc3d5c0f0dc1154':
  net_test_bluetooth: Improve set/get name logic

8 years agoMerge "net_test_bluetooth: Improve set/get name logic"
Andre Eisenbach [Wed, 23 Dec 2015 03:22:45 +0000 (03:22 +0000)]
Merge "net_test_bluetooth: Improve set/get name logic"

8 years agoFix BT connection failures
Devin Kim [Wed, 23 Dec 2015 03:18:08 +0000 (19:18 -0800)]
Fix BT connection failures
am: 78500516e5

* commit '78500516e502944f7e3f86fcfbe70f797a2e45e5':
  Fix BT connection failures

8 years agoRemove "block" parameter from eager_reader_read()
Andre Eisenbach [Wed, 23 Dec 2015 03:18:03 +0000 (19:18 -0800)]
Remove "block" parameter from eager_reader_read()
am: b9757ee3c9

* commit 'b9757ee3c9f1bb4d521624606db5b2e7ba722eeb':
  Remove "block" parameter from eager_reader_read()

8 years agoProperly reset NONBLOCK flag in semaphore_try_wait()
Andre Eisenbach [Wed, 23 Dec 2015 03:16:15 +0000 (19:16 -0800)]
Properly reset NONBLOCK flag in semaphore_try_wait()
am: 48df46b839

* commit '48df46b8398cf224a5209002cce3d534c4480d99':
  Properly reset NONBLOCK flag in semaphore_try_wait()

8 years agoFix BT connection failures
Devin Kim [Thu, 3 Dec 2015 21:19:20 +0000 (13:19 -0800)]
Fix BT connection failures

When HFP connection failed establishing between phone and watch, it can't
recover RFCOMM status which causes that HFP connection will not be made
unless BT radio goes off and comes back on. RFCOMM and HFP both trying to
open RFCOMM control channel at nearly same time, at some point, there's
a possibility that SABM packet didn't reach out to BT controller to connect
to phone from watch with HFP while phone tries to connect to watch with
AW RFCOMM.

This will take care of pending SABM packet to reach out to controller
properly so that RFCOMM status will not be messed.

Bug: 24285000
Bug: 25579482
Bug: 25579423
Bug: 25578997
Change-Id: Icc26b86c644ebd8d1c12a2fb4e94d04ba16cc2dd

8 years agoRemove "block" parameter from eager_reader_read()
Andre Eisenbach [Fri, 20 Nov 2015 22:07:24 +0000 (14:07 -0800)]
Remove "block" parameter from eager_reader_read()

Setting this parameter to true did not work and did not behave as
expected. The functionality provided by this parameter is also not
necessary, thus removing code.

Change-Id: I29e60da4adf1d1fc84d8ec9a590de89e94bb7900

8 years agoProperly reset NONBLOCK flag in semaphore_try_wait()
Andre Eisenbach [Wed, 23 Dec 2015 01:50:24 +0000 (17:50 -0800)]
Properly reset NONBLOCK flag in semaphore_try_wait()

Without this fix, calling semaphore_try_wait() on a semaphore that
wasn't currently set, would leave the NONBLOCK flag on the file
descriptor as a side-effect.

Also added a unit test for semaphores, including a test specifically for
this condition.

Change-Id: I0ea37bb68b14c76febaab25b3aee1bb4f5acee8c

8 years agonet_test_bluetooth: Improve set/get name logic
Ajay Panicker [Tue, 22 Dec 2015 21:09:48 +0000 (13:09 -0800)]
net_test_bluetooth: Improve set/get name logic

Without this CL semaphore_wait would instantly return due to the fact
that enabling the adapter would cause the properties callback to post
immediatly. Also prevented the test from returning a false positive if the
original device name was the same as the test name.

Change-Id: I987efcb9a5ef58209d37d2fc21f3c149fb3e556c

8 years agoBlacklist devices for absolute volume control
Andre Eisenbach [Tue, 22 Dec 2015 23:20:41 +0000 (15:20 -0800)]
Blacklist devices for absolute volume control
am: d0aa6cc53a

* commit 'd0aa6cc53abaf122a2426c20691ccfa025ca7369':
  Blacklist devices for absolute volume control

8 years agoBlacklist devices for absolute volume control
Andre Eisenbach [Fri, 11 Dec 2015 20:32:21 +0000 (12:32 -0800)]
Blacklist devices for absolute volume control

Some devices do not play well with absolute volume control. They either
play back music at unacceptably loud volume levels or provide
insufficiently granular volume control where a single "step" of volume
change results in unexpectedly large jumps in volume.

Bug: 2607006426060431
Change-Id: I5a336fba87119325b47a5ad385e9c48a631f2121

8 years agonet_test_bluetooth: fix set and get name tests
Ajay Panicker [Tue, 22 Dec 2015 00:41:56 +0000 (00:41 +0000)]
net_test_bluetooth: fix set and get name tests
am: ddf67ab9aa

* commit 'ddf67ab9aa665e35302f6f0183d55787c87113cd':
  net_test_bluetooth: fix set and get name tests

8 years agonet_test_bluetooth: fix set and get name tests
Ajay Panicker [Mon, 21 Dec 2015 23:05:10 +0000 (15:05 -0800)]
net_test_bluetooth: fix set and get name tests

Fixed the get and set name tests so that they are more consistent and robust.

Change-Id: I4b76357eff05531c4e52cd6de03eb3b8b969062b

8 years agoMerge "Remove dependency on base::Hash"
Christopher Wiley [Mon, 21 Dec 2015 15:53:04 +0000 (15:53 +0000)]
Merge "Remove dependency on base::Hash"
am: 17322144e3

* commit '17322144e3a5a1d66afd5926bf0b691b40c7ca44':
  Remove dependency on base::Hash

8 years agoMerge "Remove dependency on base::Hash"
Christopher Wiley [Mon, 21 Dec 2015 15:50:16 +0000 (15:50 +0000)]
Merge "Remove dependency on base::Hash"