Commit graph

3125 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
f7888e1130 Merge "modules/camera: Fix compiler warnings" 2016-08-31 21:55:30 +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
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
cbd7b77367 Merge "modules/power: Silence compiler warnings" 2016-08-25 16:25:34 +00:00
Greg Kaiser
5e53f5d85e modules/camera: Fix compiler warnings
Change-Id: I9a58f45cbfc09e4e1a243fa657dd0955648bf101
2016-08-25 06:20:32 -07:00
Greg Kaiser
854bf684af modules/power: Silence compiler warnings
Change-Id: Ib70ea23bd70ac39990cee5e1c435e346ab8f244d
2016-08-25 06:13:52 -07:00
Chih-Hung Hsieh
5f366ef448 Merge "Fix clang-tidy performance warnings in libhardware."
am: 1c1e311e06

Change-Id: I00ee76484a102dc1577566fe370af16f9283fc3e
2016-08-04 22:03:49 +00:00
Chih-hung Hsieh
1c1e311e06 Merge "Fix clang-tidy performance warnings in libhardware." 2016-08-04 21:51:11 +00:00
Mudumba Ananth
30a9dc1e99 Merge "HFP 1.7 profile update (2/4)"
am: 2ffbffae64

Change-Id: I7ac2f06b085c497f1cd26acb1cc20c5372737331
2016-08-04 01:36:11 +00:00
Andre Eisenbach
2ffbffae64 Merge "HFP 1.7 profile update (2/4)" 2016-08-04 01:06:44 +00:00
Mudumba Ananth
f991edf426 HFP 1.7 profile update (2/4)
-> Updated the HF HAL interface to support two
   new commands (AT + BIND, AT + BIEV) added
   in the profile update

Bug: 19983867
Change-Id: I672232522e9634d93ae86e5db81544b17b13576d
(cherry picked from commit 220c9d5bbe)
2016-08-03 17:49:23 -07:00
Jakub Pawlowski
63b880fb8c Merge "Remove write type from GATT descriptor writes (3/4)"
am: 8e9bc1bb9e

Change-Id: I8a7493b3c525b6eaca2630129aa04380afb7c058
2016-08-04 00:01:47 +00:00
Treehugger Robot
8e9bc1bb9e Merge "Remove write type from GATT descriptor writes (3/4)" 2016-08-03 23:54:35 +00:00
Jakub Pawlowski
f247963a95 Remove write type from GATT descriptor writes (3/4)
According to the Bluetooth Core specification v4.2, Vol 3, Part G,
section 4.12.3: "The Attribute Protocol WRITE REQUEST is used
for this sub-procedure".

Change-Id: I3bb34b52234b5c21a5ba3ec52e0c6de901c11fbe
2016-08-03 17:39:57 +00:00
Jakub Pawlowski
b815613e3c Merge "GATT Server refactoring (1/4)"
am: 7e3cfe3081

Change-Id: Ibb48b0fedf7570491f000d518c13bbc8a6af274a
2016-08-03 12:59:47 +00:00
Jakub Pawlowski
7e3cfe3081 Merge "GATT Server refactoring (1/4)" 2016-08-03 10:21:44 +00:00
Jakub Pawlowski
2693002598 GATT Server refactoring (1/4)
Bug: 27999121
Change-Id: Ica5891dc3dc530d94507ce3538723cf0d3b519e4
2016-08-02 20:46:08 +00:00
Chih-Hung Hsieh
8d78f0b7b5 Fix clang-tidy performance warnings in libhardware.
* Use const reference parameter type to avoid unnecessary copy.

Bug: 30407689
Change-Id: Ibf19e5529e548bba21fcc8403eb356cb49548172
Test: build with WITH_TIDY=1
2016-07-27 15:45:46 -07:00
Dan Willemsen
d269bf4328 resolve merge conflicts of 69ed5d9 to stage-aosp-master
Change-Id: I1e86670dcf4e3187efca4beff673bbc057cbd509
2016-07-13 11:28:47 -07:00
Dan Willemsen
69ed5d9a83 Merge "Begin converting Android.mk to Android.bp" 2016-07-13 17:47:25 +00:00
Dan Willemsen
f51bf92061 Begin converting Android.mk to Android.bp
These modules have their dependencies satisfied.

Change-Id: I67986efd7478e477770bedac72ab35a407e3d06a
2016-07-12 23:34:37 -07:00
Chih-Hung Hsieh
5aeef066b1 Merge \"Fix google-explicit-constructor warnings in libhardware\"
am: 99d2543a12

Change-Id: I28fe5fb49377f03bc962730ad8b51202e16f5854
2016-06-30 23:14:35 +00:00
Chih-hung Hsieh
99d2543a12 Merge "Fix google-explicit-constructor warnings in libhardware" 2016-06-30 22:50:53 +00:00
Chih-Hung Hsieh
928e679cf3 Fix google-explicit-constructor warnings in libhardware
Bug: 28341362
Change-Id: I29a56734e54740e4b15fe2f6cacbbd867163ae79
Test: build with clang-tidy
2016-06-30 14:21:20 -07:00
David Turner
b3e49e2257 Merge \\"[qemu]: Remove qemu_pipe.h and qemud.h headers.\\" am: 851f91adce
am: 45e04a28bb

Change-Id: I41eba6052fecba64ea538f0fd8c67bc580d5cb58
2016-06-21 08:07:58 +00:00
David 'Digit' Turner
45e04a28bb Merge \"[qemu]: Remove qemu_pipe.h and qemud.h headers.\"
am: 851f91adce

Change-Id: If7702102c2f7fc467f65bd6ff03cf58beb86e160
2016-06-21 08:05:11 +00:00
David Turner
851f91adce Merge "[qemu]: Remove qemu_pipe.h and qemud.h headers." 2016-06-21 07:38:02 +00:00
Jakub Pawlowski
da3d7e21a4 Merge \\"Vectors as parameters to GATT (3/3)\\" am: 8a86bd2c76
am: c5f748570b

Change-Id: Ic0fc566cc7ee545faffd4248fc53f5924f53fa37
2016-06-20 22:42:45 +00:00
Jakub Pawlowski
c5f748570b Merge \"Vectors as parameters to GATT (3/3)\"
am: 8a86bd2c76

Change-Id: I4eb42a0b37aa96339148d6ea91e972253c3e5190
2016-06-20 22:37:34 +00:00
Jakub Pawlowski
8a86bd2c76 Merge "Vectors as parameters to GATT (3/3)" 2016-06-20 22:35:49 +00:00
Jakub Pawlowski
e6315cea90 Merge \\"Vectors as parameters to GATT write/indicate (3/3)\\" am: f21a41a8c6
am: 6bd84560e9

Change-Id: I029209af2dd56712824e573b6a38be6088ced4e3
2016-06-20 18:10:53 +00:00
Jakub Pawlowski
6bd84560e9 Merge \"Vectors as parameters to GATT write/indicate (3/3)\"
am: f21a41a8c6

Change-Id: I3a0fe21bba0eae55e92132e26e9812179bcc17a3
2016-06-20 18:05:36 +00:00