Commit graph

3459 commits

Author SHA1 Message Date
Jakub Pawlowski
7da5970d15 Merge "Change how Advertise Data is passed to BTIF (1/3)"
am: 81f7d7e8bf

Change-Id: I29f4d0b65f3fd008d995e45e98ac6f31a98e85b8
2016-10-26 00:15:11 +00:00
Jakub Pawlowski
81f7d7e8bf Merge "Change how Advertise Data is passed to BTIF (1/3)" 2016-10-26 00:10:50 +00:00
Jakub Pawlowski
6b76de1ef0 Change how Advertise Data is passed to BTIF (1/3)
The way that AD data is passed right now put some additional
limitations, i.e. only one manufacturer specific data can be set, or
only one service UUID. By moving AD generation to upper layers, another
set of limitations is removed.

Test: Covered by BleAdvertiseApiTest sl4a test
Bug: 30622771
Change-Id: I34e8d731141caaf4497565f6e929992f6e929913
2016-10-19 14:57:05 -07:00
Jakub Pawlowski
3ed4100144 Merge "Get rid of dependency on core from linux build (2/2)"
am: 77a4c05a7e

Change-Id: Ib422f87fd63925236b650eaa9d6e2968ab932658
2016-10-19 19:18:14 +00:00
Jakub Pawlowski
77a4c05a7e Merge "Get rid of dependency on core from linux build (2/2)" 2016-10-19 18:46:21 +00:00
Jakub Pawlowski
7b4adb1dbc Get rid of dependency on core from linux build (2/2)
When building bluetooth stack for linux, don't include
dependencies from core.
2016-10-18 20:33:24 -07:00
Sanket Agarwal
4bc507a1e0 Merge "AVRCP 1.6: media browsing support on Controller"
am: 6b6400720a

Change-Id: Ib38e93f007cadf8527e429dec771220aa7c73127
2016-10-17 21:30:35 +00:00
Treehugger Robot
6b6400720a Merge "AVRCP 1.6: media browsing support on Controller" 2016-10-17 21:16:21 +00:00
Sanket Agarwal
f93277695b AVRCP 1.6: media browsing support on Controller
Bug: 28791287
Change-Id: I52519e91c9f8f6d8db05ebc8a79e118582701150
(cherry picked from commit dd4825b6ab)
2016-10-17 12:35:18 -07:00
Jakub Pawlowski
628d0a09ce Merge "Convert advertising HAL from struct into class (1/3)" am: 68669afe4d am: 184e0b88f0
am: 71c190fa64

Change-Id: I4256e62cad4529fd8894505e41f9044188cd5805
2016-10-11 17:45:47 +00:00
Jakub Pawlowski
8cf15fee33 Convert advertising HAL from struct into class (1/3) am: 4a635288b8 am: b5496ca506
am: 6e00d6c9f5

Change-Id: I01ddd09e30a7f58a906af3c27252e72ebce16784
2016-10-11 17:45:44 +00:00
Jakub Pawlowski
71c190fa64 Merge "Convert advertising HAL from struct into class (1/3)" am: 68669afe4d
am: 184e0b88f0

Change-Id: I2b996ce0e0cf48f6f2935e37602a9805ab52eea4
2016-10-11 17:40:05 +00:00
Jakub Pawlowski
6e00d6c9f5 Convert advertising HAL from struct into class (1/3) am: 4a635288b8
am: b5496ca506

Change-Id: I40cdf094a0593278680285cc082eb4b8a19895d1
2016-10-11 17:40:02 +00:00
Jakub Pawlowski
184e0b88f0 Merge "Convert advertising HAL from struct into class (1/3)"
am: 68669afe4d

Change-Id: I922053f7558fcc78acfe7f226c7a0678608b41d5
2016-10-11 17:33:14 +00:00
Jakub Pawlowski
b5496ca506 Convert advertising HAL from struct into class (1/3)
am: 4a635288b8

Change-Id: I81d7e6a3b53e0a38a2244b5c090fcc47205a147e
2016-10-11 17:32:53 +00:00
Treehugger Robot
68669afe4d Merge "Convert advertising HAL from struct into class (1/3)" 2016-10-10 22:34:50 +00:00
Jakub Pawlowski
4a635288b8 Convert advertising HAL from struct into class (1/3)
Bug: 30622771
Test: all related tests were updated
Change-Id: I61381cc57a9c8cd725478ad4e52abce9f857a373
2016-10-08 16:42:37 -07:00
Colin Cross
69735185b6 Merge "Make gralloc enums unsigned" am: e1582496f9 am: e4f267c1a1
am: 5f1f8915f9

Change-Id: I55e70cb51adb4613d9ce61d6c32365b6cddfb6e0
2016-10-08 22:50:38 +00:00
Colin Cross
5f1f8915f9 Merge "Make gralloc enums unsigned" am: e1582496f9
am: e4f267c1a1

Change-Id: I6c75d413fa8cb1702b7e3783be5454a2567fcc6e
2016-10-08 22:45:37 +00:00
Colin Cross
e4f267c1a1 Merge "Make gralloc enums unsigned"
am: e1582496f9

Change-Id: I77148ea10f16f9c387f94335b93f1a628141adee
2016-10-08 22:41:07 +00:00
Colin Cross
e1582496f9 Merge "Make gralloc enums unsigned" 2016-10-08 22:33:50 +00:00
Colin Cross
92bba13dd1 Make gralloc enums unsigned
hardware/libhardware/include was being included with -isystem, which
hides warnings.  The gralloc enum values are used as bitmasks on
unsigned types, explicitly mark them values as unsigned in order to
force the type of the resulting enum to be unsigned.

Bug: 32018017
Test: m -j
Change-Id: Iea281480574e0a7a8413273983c76c2c0f9f7049
2016-10-08 11:40:17 -07:00
Colin Cross
ca5c1a5db0 Merge changes If68bf155,I35f950ba,Idb430c45,I71a1d33a am: 3b08202c1b am: 0e9c559e41
am: c2718f802a

Change-Id: I725d3ad7488cc0337344ef4584e48840fe7a5c39
2016-10-08 00:49:06 +00:00
Colin Cross
2b932a434e Avoid C-style cast warnings am: cc8d9f9fcb am: ac416b9ed3
am: 9a786a3044

Change-Id: I35021c183bb6772c47a0e6ba9d94215dd0728d33
2016-10-08 00:49:03 +00:00
Colin Cross
74ca55073d Add name for typedef am: 64cd91274f am: 6ce096549f
am: 6f437dc0be

Change-Id: I84c46c06bd205d9cbddc5b7e565c664c5ea66e64
2016-10-08 00:49:01 +00:00
Colin Cross
848c07bfcc Fix enum switch warnings am: 248ec3da8b am: 1c74c66219
am: 3a69a4a432

Change-Id: I766feb96c1aa2576801723552509b07338ce8937
2016-10-08 00:48:59 +00:00
Colin Cross
14c19f32da Fix doc warnings am: 867e1e3043 am: 18bf56aeb7
am: 876f1ffb95

Change-Id: I33ace130d5c9751045f1cd3b15fedda69fc17950
2016-10-08 00:48:57 +00:00
Colin Cross
c2718f802a Merge changes If68bf155,I35f950ba,Idb430c45,I71a1d33a am: 3b08202c1b
am: 0e9c559e41

Change-Id: I081863b9a68718a547b060026cb2c17efe049389
2016-10-08 00:44:08 +00:00
Colin Cross
9a786a3044 Avoid C-style cast warnings am: cc8d9f9fcb
am: ac416b9ed3

Change-Id: Ia98fdea4ff7d0b2804ade2be3cf38fc637f0caee
2016-10-08 00:44:05 +00:00
Colin Cross
6f437dc0be Add name for typedef am: 64cd91274f
am: 6ce096549f

Change-Id: I69ed977862dd309c8b6f44231a364dea5bce913f
2016-10-08 00:44:00 +00:00
Colin Cross
3a69a4a432 Fix enum switch warnings am: 248ec3da8b
am: 1c74c66219

Change-Id: Ieb23d7bea30c79b65710ca7a6c9e262c8fad05a2
2016-10-08 00:43:58 +00:00
Colin Cross
876f1ffb95 Fix doc warnings am: 867e1e3043
am: 18bf56aeb7

Change-Id: I0b7562abf5d905d72cd6134e6e4d81c294f1dc92
2016-10-08 00:43:56 +00:00
Colin Cross
0e9c559e41 Merge changes If68bf155,I35f950ba,Idb430c45,I71a1d33a
am: 3b08202c1b

Change-Id: I8ccfb9f87ff47d3ffe0d7a8447cf7ed3305798d3
2016-10-08 00:40:03 +00:00
Colin Cross
ac416b9ed3 Avoid C-style cast warnings
am: cc8d9f9fcb

Change-Id: Ia3f4055fc83a9e7273c162f8095bd36f9f63af1f
2016-10-08 00:40:02 +00:00
Colin Cross
6ce096549f Add name for typedef
am: 64cd91274f

Change-Id: Ide4ad000ad2a8951b62e722cb5c09d36df1c9924
2016-10-08 00:40:00 +00:00
Colin Cross
1c74c66219 Fix enum switch warnings
am: 248ec3da8b

Change-Id: Ib581466c7f514ee89d8b902eb86d9e6b33e21753
2016-10-08 00:39:58 +00:00
Colin Cross
18bf56aeb7 Fix doc warnings
am: 867e1e3043

Change-Id: Ic9c6c1dddd1243fa01102fafcbe1ab5462316644
2016-10-08 00:39:56 +00:00
Colin Cross
3b08202c1b Merge changes If68bf155,I35f950ba,Idb430c45,I71a1d33a
* changes:
  Avoid C-style cast warnings
  Add name for typedef
  Fix enum switch warnings
  Fix doc warnings
2016-10-08 00:32:04 +00:00
Colin Cross
cc8d9f9fcb Avoid C-style cast warnings
hardware/libhardware/include was being included with -isystem, which
hides warnings.  Use a macro to convert modules to hw_device_t** to call
the open function that works in C++ and C.

Bug: 32018017
Test: m -j
Change-Id: If68bf15581975f1217fcab366cef7bc784894641
2016-10-07 13:10:20 -07:00
Colin Cross
64cd91274f Add name for typedef
hardware/libhardware/include was being included with -isystem, which
hides warnings.  Add the missing name for a typedef.

Bug: 32018017
Test: m -j
Change-Id: I35f950ba3e26836cb51312ef28e98748f29d8cd8
2016-10-07 13:10:07 -07:00
Colin Cross
248ec3da8b Fix enum switch warnings
hardware/libhardware/include was being included with -isystem, which
hides warnings.  -Wswitch requires that all cases in a switch statement
on an enum be enum values.  For enums being used as bit flags, cast the
enum to an int.

Bug: 32018017
Test: m -j
Change-Id: Idb430c451d017bb7ec61a7119d6abd87b6dcdc87
2016-10-07 13:10:07 -07:00
Colin Cross
867e1e3043 Fix doc warnings
hardware/libhardware/include was being included with -isystem, which
hides warnings.  Fix use of doxygen function comments on on function
pointers, which are not considered functions or methods.

Bug: 32018017
Test: m -j
Change-Id: I71a1d33a9ae90b646bf22f32e052bbe22e8aca76
2016-10-07 13:10:07 -07:00
Tucker Sylvestro
8f1436275a Treat all tags as unsigned when comparing them
am: 28a872eb79

Change-Id: If741daf9b99a3cb8f73f9ff3b06699b662b6b54a
2016-10-06 14:36:52 +00:00
Peng Xu
4b36c5e462 Merge "[sensor] Clarification of sensor HAL behavior at deactivation" am: 04302ea2fa am: 4b59f97c82
am: 52946f658e

Change-Id: I0b7ee019e397a0e567ddaa5914ec5bacd095c9fc
2016-10-06 00:23:46 +00:00
Peng Xu
52946f658e Merge "[sensor] Clarification of sensor HAL behavior at deactivation" am: 04302ea2fa
am: 4b59f97c82

Change-Id: I19da92850d6f02e11d8605361c6e5a5c6dcc94cd
2016-10-06 00:20:46 +00:00
Peng Xu
4b59f97c82 Merge "[sensor] Clarification of sensor HAL behavior at deactivation"
am: 04302ea2fa

Change-Id: Ib6f8d3112d2d07cdb492c9c8eb91d61fd7dac60e
2016-10-06 00:18:14 +00:00
Treehugger Robot
04302ea2fa Merge "[sensor] Clarification of sensor HAL behavior at deactivation" 2016-10-06 00:10:02 +00:00
Peng Xu
aaeeaa41bd [sensor] Clarification of sensor HAL behavior at deactivation
Sensor HAL should abandon stale data at deactivation.

Test: documentation change, spell checked.
Bug: 28443809

Change-Id: I29b1d324fc96d0448cdefbf2130161f71c3d3310
2016-10-05 15:17:33 -07:00
Tucker Sylvestro
28a872eb79 Treat all tags as unsigned when comparing them
All tags are presumed to be unsigned, but some of them have signed
representations that are negative.  This caused problems in
AuthorizationSet.Deduplicate, where TAG_APPLICATION_DATA (signed rep
of -1879047492) was being sorted before TAG_INVALID (0), which was
presumed to always be first in the list.

BUG: 30701680
Change-Id: I67047cee21fd7617248022a4674779fe80d5ddfd
2016-10-05 14:39:39 -04:00
Peng Xu
7542bf2aca [sensors] SENSOR_TYPE_DYNAMIC_SENSOR_META should be wake up
Sensor of type SENSOR_TYPE_DYNAMIC_SENSOR_META should be
wake up sensor to allow system to correctly track dynamic sensor
connectiona nd disconnection. Otherwise, connection or disconnection
event may get discarded.

Test: m cts-verifier
Test: Run "Dynamic Sensor Discovery Test" with a sensor HAL that
      support dynamic sensor discovery (e.g. contexthub + ag/1189124)
Bug: 31068976

Change-Id: Ia3d860a03977318c55f7f3b751ca327b5ff1528c
2016-09-27 14:02:06 -07:00