Commit graph

3154 commits

Author SHA1 Message Date
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
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
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
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
Jakub Pawlowski
b7698b65e8 Merge "Fix an incorrect description of OOB data field"
am: 4074ce1408

Change-Id: Idd303ab7cdff1b3cf7f57589eee6ad4f8f0ebbb5
2016-09-22 19:36:45 +00:00
Treehugger Robot
4074ce1408 Merge "Fix an incorrect description of OOB data field" 2016-09-22 18:57:24 +00:00
Jakub Pawlowski
9caabe1563 Fix an incorrect description of OOB data field
Change-Id: Ia3712d9af9d5521e2a3cc9ecbcf7b37fd0755c9a
2016-09-22 17:10:12 +00:00
Jakub Pawlowski
ba15066e9a Merge "Bluetooth: split setting params and enabling advertising (2/3)"
am: 9e1a02cc5e

Change-Id: I8fb2bf0b7e0da7c6685c53614147f385db1072dc
2016-09-13 08:35:40 +00:00
Treehugger Robot
9e1a02cc5e Merge "Bluetooth: split setting params and enabling advertising (2/3)" 2016-09-13 08:30:27 +00:00
Jakub Pawlowski
bb84c86f5a Bluetooth: split setting params and enabling advertising (2/3)
Proper order of commands when starting advertising:
* set parameters
* set data
* enable advertising

This cannot be achieved when setting advertising parameters and enabling
advertising is put together in one function. Enabling before setting
data might cause first advertisements to be empty. If a device with
hardware filter pick up such advertisement, it might fail to properly
recognize our device.

Bug: 30622771
Bug: 19372779
Change-Id: Iac154beb5129526fa3cd1d1b31eba269459bc9a0
2016-09-13 06:26:14 +00:00
Dan Stoza
b92b5dea6b Merge "Re-add gralloc 1.0 header"
am: e7a66b9abc

Change-Id: I78acb8c9e3ab9f2e7b8a96768faf42cff5827ad1
2016-09-09 21:28:31 +00:00
Dan Stoza
e7a66b9abc Merge "Re-add gralloc 1.0 header" 2016-09-09 21:21:19 +00:00
Dan Stoza
a2d5b7d898 Re-add gralloc 1.0 header
Adds the header for version 1.0 of the gralloc HAL, now that the
framework properly supports it.

Bug: 28401203
Change-Id: I2ef28ca1e5ed5e9e71a14c4d1c97245051acce6c
2016-09-09 12:04:29 -07:00
Dan Stoza
4615640eda Merge changes I90234d91,Idf5f86c9
am: 799c3fc422

Change-Id: Iba5d86f1fe5b0153659c4d9c5db7ce4906e2c4c4
2016-09-09 16:59:45 +00:00
Dan Stoza
340c62640b HWC2: Add SKIP_CLIENT_COLOR_TRANSFORM capability
am: d2168f7e47

Change-Id: I99ace969c14ea19456f7aa5cb237aba6d310ffb4
2016-09-09 16:59:44 +00:00
Dan Stoza
1514607cb6 HWC2: Redefine retire fence as present fence
am: ef264828fe

Change-Id: I3f3dff2ef7b09d48329db58c08dfb3441219ef8b
2016-09-09 16:59:42 +00:00
Dan Stoza
799c3fc422 Merge changes I90234d91,Idf5f86c9
* changes:
  HWC2: Add SKIP_CLIENT_COLOR_TRANSFORM capability
  HWC2: Redefine retire fence as present fence
2016-09-09 16:51:40 +00:00
Dan Stoza
d2168f7e47 HWC2: Add SKIP_CLIENT_COLOR_TRANSFORM capability
Adds HWC2_CAPABILITY_SKIP_CLIENT_COLOR_TRANSFORM, which indicates
that the client should never apply the color transform, even if all
layers are being composed by the client. This allows the device to
use its color management hardware in all cases to avoid any potential
mismatches between client and device application of the transform.

Bug: 29870302
Change-Id: I90234d91858206714e650eadb03227a4a180d975
2016-09-08 15:01:49 -07:00
Dan Stoza
ef264828fe HWC2: Redefine retire fence as present fence
Redefines the retire fence returned by presentDisplay to be a present
fence with more strictly defined semantics: this fence should fire
at the vsync when the frame is picked up by hardware, either for
scanout (in the case of video-mode panels) or for transfer to panel
memory (in the case of command-mode panels).

Bug: 29771461
Change-Id: Idf5f86c92a8748426cf3368242c08876a48d81dd
2016-09-08 15:01:34 -07:00
Dan Albert
0767b6f63c Merge "Stop hard coding gmock things."
am: 8bc59ec625

Change-Id: If83696671a05cf7bf34655b88b08e8b6d08570ac
2016-09-06 19:57:51 +00:00
Treehugger Robot
8bc59ec625 Merge "Stop hard coding gmock things." 2016-09-06 19:42:34 +00:00
Dan Albert
b55da5dd3f Stop hard coding gmock things.
The headers are exported.

Change-Id: I72f8dda3f441bc72accce3c9e94a7160fcefc54c
Test: mma
(cherry picked from commit a26bcd5424)
2016-09-06 11:07:26 -07:00
Ajay Panicker
87de611820 Merge "AVRCP 1.6: media browsing support on Target(2/3)"
am: b576a06972

Change-Id: I607a5add630caa684e6cf1d4011d991b20e3c05c
2016-09-02 21:05:05 +00:00
Ajay Panicker
b576a06972 Merge "AVRCP 1.6: media browsing support on Target(2/3)" 2016-09-02 20:46:01 +00:00
Avish Shah
f20c24e86b AVRCP 1.6: media browsing support on Target(2/3)
-> As a part of Avrcp 1.6 upgrade, added support
   for following features:
   [1] setAddressedPlayer
   [2] setBrowsedPlayer
   [3] getFolderItems scope=VFS/NowPlaying/Search
   [4] changePath
   [5] getItemAttributes
   [6] playItem
   [7] getTotalNumberOfItems
   [8] search string in current browsed path.
   [9] AddToNowPlaying
-> Defined functions and enhanced structures to
   support above mentioned features.
-> Added support for dual RC.

Bug: 19361366
Merged-In: I0ab7f0c7d87c06fe4f454151d20494c56aceae12
Change-Id: I0ab7f0c7d87c06fe4f454151d20494c56aceae12
2016-09-02 19:51:25 +00:00
Greg Kaiser
f832261e65 Merge "modules/camera: Fix compiler warnings"
am: f7888e1130

Change-Id: I0d124cf79d331cde00ccce07dfa6215e66e52360
2016-08-31 22:04:23 +00:00
Greg Kaiser
f7888e1130 Merge "modules/camera: Fix compiler warnings" 2016-08-31 21:55:30 +00:00
Jakub Pawlowski
7703e64ee5 Merge "Separate advertiser from GATT client (3/4)"
am: 7a3148bc41

Change-Id: I8cc7558fee5812ff3ec1e4aed1cb52ccac7cd294
2016-08-31 18:14:43 +00:00
Jakub Pawlowski
7a3148bc41 Merge "Separate advertiser from GATT client (3/4)" 2016-08-31 18:05:27 +00:00
Jakub Pawlowski
6ecdb8c0cd Separate advertiser from GATT client (3/4)
Bug: 30622771
Change-Id: Ib9f9a27a2d1a7945b05a1c985cf78b46f4b97026
2016-08-30 10:46:53 -07:00
Chih-hung Hsieh
9d2f461264 Merge "Fix misc-macro-parentheses warnings in context-hub.h."
am: 81a5640cf9

Change-Id: I8c8c0f5e7fb079baab8dfdda5a5eb6f3256d6843
2016-08-27 00:48:39 +00:00
Chih-hung Hsieh
81a5640cf9 Merge "Fix misc-macro-parentheses warnings in context-hub.h." 2016-08-27 00:40:59 +00:00
Chih-Hung Hsieh
dc57369f96 Fix misc-macro-parentheses warnings in context-hub.h.
* Add parentheses around macro parameters.
Bug: 28705665
Test: build with WITH_TIDY=1

Change-Id: Ib1f4a99b331a844d50271a795b1582ce034a4f0c
2016-08-26 16:08:07 -07:00
Greg Kaiser
161beacc8c Merge "modules/power: Silence compiler warnings"
am: cbd7b77367

Change-Id: I2f86d064f1e445591b6a4cfc4afe5c0e5089fe65
2016-08-25 16:31:49 +00:00