Commit Graph

157 Commits

Author SHA1 Message Date
Myles Watson
0e06a63c76 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
2017-09-06 23:58:18 +00:00
Peng Qi
5c6da2669c Bluetooth: AsyncFdWatcher: Fix FD leak
AsyncFdWatcher thread notification pipe fds without close
which causes FD leak under Bluetooth on/off stress test.

Close the notification pipe fds when shut down Bluetooth.

Test: Bluetooth on/off stress test

Change-Id: I7575adec49161f9764f0e070ef3c1043b8295a97
2017-08-29 17:55:21 +00:00
Myles Watson
8d0d6f99df Bluetooth: Remove random MAC addresses
Bug:65014945
Test: boot a wiped device with no property set, check the Bluetooth address
Change-Id: I905f9dbf2f0782e19de64a8f798d1e26ffd9f1bf
2017-08-25 13:18:41 +00:00
Treehugger Robot
dcc6f25d05 Merge "Bluetooth: Check H4 HCI packet types" 2017-08-24 23:31:54 +00:00
Myles Watson
9833109a3e 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-24 17:48:18 +00:00
Myles Watson
521621d515 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-24 16:24:18 +00:00
Myles Watson
b58a5a0b6a Merge "Bluetooth: Check the number of file descriptors"
am: 6b75bccdce

Change-Id: I16d0c95de17649cd5750aad13a7578c3e7c007b0
2017-08-10 00:39:52 +00:00
Treehugger Robot
6b75bccdce Merge "Bluetooth: Check the number of file descriptors" 2017-08-10 00:30:44 +00:00
Myles Watson
372e367651 Merge "Bluetooth: Add OWNERS file for default/"
am: 7b351292fe

Change-Id: I34716c300678db8d1ae6a4d5aada936d8ce009fc
2017-08-09 20:40:34 +00:00
Myles Watson
7c127dc4cb Bluetooth: Add OWNERS file for default/
Test: build
Change-Id: Ib4cbd5502ac0791d4bc700f28de68d0548256de6
2017-08-09 18:34:19 +00:00
Myles Watson
ec1eda69b6 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
2017-08-09 18:23:48 +00:00
Steven Moreland
271d53d836 Update makefiles for vndk enabled.
am: 5e59402492

Change-Id: I08414d68d5275df82336653cb91765af7235f914
2017-08-09 00:44:39 +00:00
Steven Moreland
5e59402492 Update makefiles for vndk enabled.
Test: none
Bug: 63866913
Merged-In: I29174fdadca2828455ef49f14e53bc95c5238dbb
Change-Id: I29174fdadca2828455ef49f14e53bc95c5238dbb
(cherry picked from commit c716b8c307)
2017-08-08 17:09:10 +09:00
Steven Moreland
4e06dd1aa9 Merge changes from topic 'go-away-static-hidl-java'
am: f4c58cd48c

Change-Id: I3502ad1d51868cd82bbe811bdf2b96ec45ccfbe6
2017-08-04 19:22:05 +00:00
Steven Moreland
f4c58cd48c Merge changes from topic 'go-away-static-hidl-java'
* changes:
  Update makefiles.
  Add an empty 1.1 ISap interface.
  [AWARE] Fix validity check on PMK + export PASSPHRASE lengths
2017-08-04 19:14:48 +00:00
Steven Moreland
b5da32c177 Update makefiles.
Removes redundant "java-static" target.

Note, targets aren't removed here which have internal
targets that depend on them.

Bug: 36376126
Test: pass
Change-Id: I830f02e5f219d2d58721132c358d2783c3942eac
2017-08-03 15:25:21 -07:00
Tri Vo
7f8774ef80 Merge changes from topic 'vts_deps'
am: 7d149a564f

Change-Id: Idf236b741d7ff2cc529002218c34a3b4f0cf625c
2017-08-03 20:15:19 +00:00
Treehugger Robot
7d149a564f Merge changes from topic 'vts_deps'
* changes:
  VTS tests now static link to HAL def libs.
  Add cc_defaults VtsHalTargetTestDefaults
2017-08-03 20:06:15 +00:00
Tri Vo
6c2bd86f70 VTS tests now static link to HAL def libs.
And use VtsHalTargetTestDefaults.

Bug: 64040096
Test: compiles
Change-Id: I3cfb1a64f6abcf3145337a736800b72d92a0b152
2017-08-03 18:04:00 +00:00
Sundong Ahn
79e801cb18 Change dependency library
am: 94293086f8

Change-Id: I3b024890195dad8fa3435a4ff493adbddb63ef20
2017-08-02 16:56:46 +00:00
Sundong Ahn
94293086f8 Change dependency library
hwbinder.jar will be used instead of framework.jar on build-time, but
on runtime framework.jar will be used.

This is to cut the circular dependency when using configstore from
Android framework.

Bug: 35771640
Test: no test.
Change-Id: I04cab676c91d2ea423f5e2c1b2b9efa15e522f37
2017-08-01 11:24:01 +09:00
Steven Moreland
68a25d22e3 Merge "Update HIDL makefiles."
am: 49dad304a5

Change-Id: I29f1de44312f589ba6e1df9498809cbb31315a2b
2017-07-31 19:33:34 +00:00
Steven Moreland
7206708528 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
Change-Id: I1b2401fb273ab80819e3870aa71fe742269674ba
2017-07-26 10:14:57 -07:00
Stanley Tng
cd762d90e8 Merge "Fixed the HCI ACL Header definitions for PB and BC Flags"
am: adda0e8721

Change-Id: Ie621b523fb21a014dcbc7f5a2295778758333acc
2017-07-20 18:19:35 +00:00
Stanley Tng
7915b71fb9 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
2017-07-19 11:03:27 -07: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
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
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