Commit graph

153 commits

Author SHA1 Message Date
Myles Watson
c7c333931c Bluetooth: Remove credit check from Loopback tests
The Bluetooth specification doesn't require data credits
to come back within a specific timeframe, so the VTS test
can not require it.

Bug: 65269854
Test: VtsHalBlueoothV1_0TargetTest with simulated chip (no credits)
Change-Id: If2fc052d3b5236f6a3097f3d5403882226561404
(cherry picked from commit 0e06a63c76)
2017-09-07 13:41:58 +00:00
TreeHugger Robot
300ebef0a3 Merge "Bluetooth: Return false when not shut down" into oc-mr1-dev 2017-08-25 17:38:18 +00:00
Myles Watson
6ebbc2cff7 Bluetooth: Return false when not shut down
Do not crash in the vendor layer.  The stack will crash
when it fails to initialize.

Bug: 64535243
Test: Bluetooth starts/stops
Change-Id: I69fdd2879c80fa2f006c50f0a42a85e9289b14fe
2017-08-25 15:02:32 +00:00
Myles Watson
d1ccbc1bac Bluetooth: Check H4 HCI packet types
An invalid type byte can cause an access outside
the bounds of the array.

Bug: 64565737
Test: Bluetooth On/Off
Change-Id: Ie11dd62942f66b9fc60ebce2e4339c37d597fdf0
2017-08-25 15:01:56 +00:00
Myles Watson
c2cf173510 Merge "Bluetooth: Check the number of file descriptors" into oc-dr1-dev
am: 269d9ba09a

Change-Id: I1260d97229e5330481178c8f802e2c7f6b651582
2017-08-10 03:10:57 +00:00
TreeHugger Robot
269d9ba09a Merge "Bluetooth: Check the number of file descriptors" into oc-dr1-dev 2017-08-10 03:05:38 +00:00
Myles Watson
fb75b605bb Merge "Bluetooth: Add OWNERS file for default/" into oc-dr1-dev
am: 5397fa8175

Change-Id: I1587c5451950a89c6aac991a0d8b7dacea16fe21
2017-08-10 00:39:03 +00:00
Myles Watson
a671c0b8d1 Bluetooth: Add OWNERS file for default/
Test: build
Change-Id: Ib4cbd5502ac0791d4bc700f28de68d0548256de6
(cherry picked from commit 7c127dc4cb)
2017-08-09 14:25:32 -07:00
Myles Watson
07ea6b4f7e Bluetooth: Check the number of file descriptors
Opening the serial port(s) returns -1 when it fails, check
that the number of file descriptors is greater than 0 and
less than the size of the array.

Test: VtsHalBluetoothV1_0TargetTest, Bluetooth start/stop
Bug: 64420262
Change-Id: Icbffa5bd8c02030e389bac03aa5e1e78cc3c6057
(cherry picked from commit 89316af23eb7aa300015a3d80bc97891cfe6031e)
2017-08-09 18:22:44 +00:00
TreeHugger Robot
d9b12c13e5 Merge "Update makefiles for vndk enabled." into oc-mr1-dev 2017-08-04 00:52:06 +00:00
Tri Vo
35c7bd2e2b VTS tests now static link to HAL def libs.
And use VtsHalTargetTestDefaults.

Bug: 64040096
Test: compiles
Merged-In: I3cfb1a64f6abcf3145337a736800b72d92a0b152
Change-Id: I3cfb1a64f6abcf3145337a736800b72d92a0b152
(cherry picked from commit 6c2bd86f70)
2017-08-03 13:28:08 -07:00
Steven Moreland
c716b8c307 Update makefiles for vndk enabled.
Test: none
Bug: 63866913
Change-Id: I29174fdadca2828455ef49f14e53bc95c5238dbb
2017-08-02 18:00:14 -07:00
Steven Moreland
208a586cf8 Update HIDL makefiles.
Allow them to be static.

This is required for a couple of reasons:
- enabling HIDL passthrough in recovery
- enabling VTS tests to be static blobs

Bug: 32920003
Bug: 64040096
Test: update-all-google-makefiles.sh
Merged-In: I1b2401fb273ab80819e3870aa71fe742269674ba
Change-Id: I1b2401fb273ab80819e3870aa71fe742269674ba
(cherry picked from commit 7206708528)
2017-08-02 12:52:41 -07:00
Stanley Tng
73363c1fe9 Merge "Fixed the HCI ACL Header definitions for PB and BC Flags" into oc-dev am: ad6b1eb846
am: 6138bbeafb

Change-Id: I450bfa1b5d6133e478761781ae43536fe972eae6
2017-07-22 16:00:51 +00:00
Stanley Tng
6138bbeafb Merge "Fixed the HCI ACL Header definitions for PB and BC Flags" into oc-dev
am: ad6b1eb846

Change-Id: I1636ac9ff75062d170db6032b8e657a0f5b29f54
2017-07-22 15:57:52 +00:00
Stanley Tng
5c98115486 Fixed the HCI ACL Header definitions for PB and BC Flags
The byte offsets for Packet Boundary (PB) and Broadcast (BC) flags
in the HCI ACL Header is swapped. This will fixed it so that it matches
the Bluetooth Specifications.

Bug: 63241720
Test: Run manual VTS tests for Bluetooth
Change-Id: Ifc1f4d4f054a1dab13458c563e47bfb884f39d92
(cherry picked from commit 7915b71fb9)
2017-07-22 06:35:47 -07:00
Jiyong Park
cb198f7990 Build android.hardware.bluetooth* modules with BOARD_VNDK_VERSION
Add missing headers that aren't automatically included when
BOARD_VNDK_VERSION is set.

Bug: 37342627
Test: BOARD_VNDK_VERSION=current m -j <module> where <module> is
android.hardware.bluetooth-async.vendor,
android.hardware.bluetooth@1.0-impl.vendor, and
android.hardware.bluetooth-hci.vendor

Change-Id: Ifb14d254fa358fbd2b9fbeecb028d6efd18e9483
2017-07-10 13:28:55 +09:00
Myles Watson
a7dc6fb5b4 Bluetooth: Change CHECK() to LOG_ALWAYS_FATAL()
Bug: 62641184
Test: Compilation
Change-Id: I21192c7a5c15def379d040b586a66ee1534c7c15
(cherry picked from commit 3e272a7076)
2017-07-07 23:00:30 +00:00
Myles Watson
517186aec1 Merge "Bluetooth: Change CHECK() to LOG_ALWAYS_FATAL()"
am: 1a31a9e45e

Change-Id: I1fbef8d12e61c55bd5aa4b53378672aa6a5a54f7
2017-07-07 03:24:53 +00:00
Treehugger Robot
1a31a9e45e Merge "Bluetooth: Change CHECK() to LOG_ALWAYS_FATAL()" 2017-07-07 03:18:41 +00:00
Jakub Pawlowski
ef5d1b0209 Merge "Make RawAddress into a class (4/4)"
am: 1bd5a3ff87

Change-Id: I619d560145d6d4058be35de74bc4ded503da455e
2017-07-07 01:34:39 +00:00
Treehugger Robot
1bd5a3ff87 Merge "Make RawAddress into a class (4/4)" 2017-07-07 01:29:30 +00:00
Jakub Pawlowski
19f1c07b3a Make RawAddress into a class (4/4)
* Add libbluetooth-types - library containing types implementation, that
is common between stystem/bt and packages/apps/Bluetooth. It must be
included in every project using btif interface.
* Put Raw Address implementation into libbluetooth-types
* Unify all "to/from string" helper methods into ToString and FromString
* bd_addr_empty -> RawAddress::kEmpty
* bd_addr_any -> RawAddress::kAny

Also fix leaks in jni str2addr by adding ReleaseStringUTFChars

Test: types_unittest
Change-Id: I7dca82ec2293ae5338a9500dd6aa43b59d25657a
Merged-In: I7dca82ec2293ae5338a9500dd6aa43b59d25657a
2017-07-06 22:40:09 +00:00
Myles Watson
3e272a7076 Bluetooth: Change CHECK() to LOG_ALWAYS_FATAL()
Bug: 62641184
Test: Compilation
Change-Id: I21192c7a5c15def379d040b586a66ee1534c7c15
2017-07-06 18:44:22 +00:00
Peng Qi
1d3d5a96f0 BT HAL H4 write flow
If to send type and data separately for one HCI packet,
it will cause two system call context switch to kernel space,
which will introduce software overhead on data path.
Plus, if vendor does not use pure UART interface, it causes different
data behavior on BUS and may not adapt to all vendors as legacy HAL did.
Considering backward-compatibility, to use writev to send
type and data together once as legacy BT HAL did.

Bug: 63391357
Test: H4 UTTest, BT VTS test, Bluetooth on/off
Change-Id: I2d93085fe0c01b48d0e3729a3fa85b5b27335b2c
(cherry picked from commit 92afd74a15)
2017-07-06 18:40:04 +00:00
Peng Qi
2b1413fd87 BT HAL H4 write flow
am: 92afd74a15

Change-Id: Ie8231290c6aa5600c3e9c355b04fe494aa64d190
2017-07-06 16:27:51 +00:00
Peng Qi
92afd74a15 BT HAL H4 write flow
If to send type and data separately for one HCI packet,
it will cause two system call context switch to kernel space,
which will introduce software overhead on data path.
Plus, if vendor does not use pure UART interface, it causes different
data behavior on BUS and may not adapt to all vendors as legacy HAL did.
Considering backward-compatibility, to use writev to send
type and data together once as legacy BT HAL did.

Test: H4 UTTest, BT VTS test, Bluetooth on/off
Change-Id: I2d93085fe0c01b48d0e3729a3fa85b5b27335b2c
2017-06-30 12:32:11 -07:00
Bailey Forrest
92863322a5 Merge "Include missing headers" am: 1bbe51d0b5
am: 9cf1bbb045

Change-Id: I37f592401697c92115eea0ca33eea4170f549712
2017-06-17 00:22:10 +00:00
Treehugger Robot
1bbe51d0b5 Merge "Include missing headers" 2017-06-17 00:09:23 +00:00
Bailey Forrest
ba20404ca2 Include missing headers
Bug: None
Test: Build
Change-Id: Id4967af4ab48ceda10c45edcb0bc4b856b991fd6
2017-06-12 16:49:18 -07:00
Myles Watson
76f5c505bf Merge "Bluetooth: Call vendor cleanup() in Close()" into oc-dev
am: 32ee110269

Change-Id: I6e361c5cb186730ff25ff17d0418c9f01b944359
2017-06-12 22:59:29 +00:00
Myles Watson
5082bca12e Bluetooth: Call vendor cleanup() in Close()
Bug: 62453652
Test: sailfish and angler start/stop Bluetooth, pair
Change-Id: I8ba80ae1802d1f524acb1d8e26b5bb41fc1612d0
(cherry picked from commit 9eee83093f)
2017-06-09 15:39:26 -07:00
Myles Watson
b68bcfd769 Bluetooth: Call vendor cleanup() in Close() am: 9eee83093f
am: 58c51ad669

Change-Id: I33fb722609665638c866da062babaae3fcba0c6d
2017-06-09 22:21:23 +00:00
Myles Watson
9eee83093f Bluetooth: Call vendor cleanup() in Close()
Bug: 62453652
Test: sailfish and angler start/stop Bluetooth, pair
Change-Id: I8ba80ae1802d1f524acb1d8e26b5bb41fc1612d0
2017-06-08 20:35:32 +00:00
Myles Watson
0af2996160 Bluetooth: Remove scheduler-service dependency
am: 8c71c85252

Change-Id: I2c1a8cd403930270110ca5854aca8c01c9327134
2017-05-27 02:14:18 +00:00
Myles Watson
8c71c85252 Bluetooth: Remove scheduler-service dependency
Bug: 38178265
Test: Bluetooth enable/disable
      adb shell stop && adb shell VtsHalBluetoothV1_TargetTest

Change-Id: I7f892bad73f72b46b7b1720bda267fdddad21948
2017-05-26 20:34:12 +00:00
Steven Moreland
67b9ae7d9c Merge "Update makefiles." am: 9119d4ccd1 am: 242b2288d7
am: c6da54569f

Change-Id: Ib7f7a9cdb64985d545443edac5bb8e9c169fc592
2017-05-20 00:19:40 +00:00
Steven Moreland
e4d318948a Update makefiles.
Adds default configuration to all hals.

Test: pass
Merged-In: Icdf6b56df82c4b7b7de815e7febea9a07ab96856
Change-Id: Icdf6b56df82c4b7b7de815e7febea9a07ab96856
2017-05-19 15:53:53 -07:00
Steven Moreland
06c85d986a Update makefiles.
Adds default configuration to all hals.

Test: pass
Change-Id: Icdf6b56df82c4b7b7de815e7febea9a07ab96856
2017-05-18 16:14:16 -07:00
Myles Watson
6c4020d1d0 Bluetooth: Add a second thread for the scheduler
am: 33f36706d0

Change-Id: I4730416f799b0947690d4a4544be41bfed191afb
2017-05-12 18:01:57 +00:00
Myles Watson
33f36706d0 Bluetooth: Add a second thread for the scheduler
Test: service call bluetooth_manager 6 # (Stop Bluetooth)
      /data/nativetest64/VtsHalBluetoothV1_0TargetTest/\
          VtsHalBluetoothV1_0TargetTest
Bug: 38178265, 34461621
Change-Id: Ia8f6683ca47c9deac43d1047846caee5688f1eca
(cherry picked from commit 74c601361c)
2017-05-11 17:28:06 -07:00
Myles Watson
74c601361c Bluetooth: Add a second thread for the scheduler
Test: service call bluetooth_manager 6 # (Stop Bluetooth)
      /data/nativetest64/VtsHalBluetoothV1_0TargetTest/\
          VtsHalBluetoothV1_0TargetTest
Bug: 38178265, 34461621
Change-Id: Ia8f6683ca47c9deac43d1047846caee5688f1eca
2017-05-11 16:57:01 -07:00
Steven Moreland
8716f3063e Update makefiles for c++-sources and c++-headers.
Test: pass
Bug: 38174080
Merged-In: I683455736eed35e6ced24e2763c2bdb5fb6c9601
Change-Id: I683455736eed35e6ced24e2763c2bdb5fb6c9601
2017-05-09 19:58:45 -07:00
Steven Moreland
8e89a43590 Update makefiles for c++-sources and c++-headers. am: cb360c60d8 am: 4bd4e7fb3b
am: 127b116fe5

Change-Id: I3a2aa76acef0f0d1455bfad775e87e8089d357e8
2017-05-10 02:58:00 +00:00
Steven Moreland
cb360c60d8 Update makefiles for c++-sources and c++-headers.
Test: pass
Bug: 38174080
Change-Id: I683455736eed35e6ced24e2763c2bdb5fb6c9601
2017-05-09 14:34:19 -07:00
Yi Kong
c86120fbb4 Remove unused lambda captures am: 5ca756ea1f am: 68f6e99613
am: dcf35ca86e

Change-Id: I025a2f240cb6f4278bece0f1b3c91dbfcdffa0fc
2017-05-08 17:24:21 +00:00
Yi Kong
5ca756ea1f Remove unused lambda captures
Test: build
Bug: 37752547
Change-Id: I339baf849c7aef97dd319377026564dedd0cc568
2017-05-05 13:35:50 -07:00
Steven Moreland
f90189a79f Merge "Remove redundant dependencies" am: 62769b7196 am: 170e2e85a2
am: 5fba1db1d2

Change-Id: I661fff75d140b4359af055a0f08f08ef33c889c3
2017-05-01 23:37:04 +00:00
Treehugger Robot
62769b7196 Merge "Remove redundant dependencies" 2017-05-01 23:19:25 +00:00
Steven Moreland
ee1d248ae2 Remove redundant dependencies
android.hidl.base@1.0 and android.hidlmanager@1.0 are built into libhidltransport.

Test: links
Bug: 33276472
Change-Id: I424371932af129bba9d58dcf8652c64297f35f05
2017-05-01 09:47:58 -07:00