Commit graph

3964 commits

Author SHA1 Message Date
Chih-hung Hsieh
db93c00658 Merge "Fix misc-macro-parentheses warnings in context-hub.h." am: 81a5640cf9 am: 9d2f461264 am: ff72d357d4
am: 96c7903501

Change-Id: I31f49b5eadf3f1aaf088978553aeb3d497b5d77b
2016-08-27 01:35:49 +00:00
Chih-hung Hsieh
96c7903501 Merge "Fix misc-macro-parentheses warnings in context-hub.h." am: 81a5640cf9 am: 9d2f461264
am: ff72d357d4

Change-Id: I935e32cd73ae3d29d6886dc4701f02db52bc7987
2016-08-27 00:54:08 +00:00
Chih-hung Hsieh
ff72d357d4 Merge "Fix misc-macro-parentheses warnings in context-hub.h." am: 81a5640cf9
am: 9d2f461264

Change-Id: I2442b6a6153508a875eb64eeaf572a83f587bcc1
2016-08-27 00:51:07 +00: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
Ari Hausman-Cohen
4f7139e6d9 Move Camera HAL 3.0 reference implementation.
Moved files to a subdir to allow reference implementations
of other versions to join this same space without conflict.

BUG: b/31117512
TEST: lunch bullhead-eng, make -j32, m -j32 camera.default
Change-Id: I9bc3047bd3c00c53ce4d4e4f2070d8ee1453c936
2016-08-26 15:49:50 -07:00
Greg Kaiser
ba31c43d96 Merge "modules/power: Silence compiler warnings" am: cbd7b77367 am: 161beacc8c am: 82fdd04600
am: 81284e97f1

Change-Id: I8de30429715f7f3b551191254a649cfbf6569639
2016-08-25 16:59:22 +00:00
Greg Kaiser
81284e97f1 Merge "modules/power: Silence compiler warnings" am: cbd7b77367 am: 161beacc8c
am: 82fdd04600

Change-Id: I0d4f8aa78f78f3f6d9f2d01171e5cadf052afbba
2016-08-25 16:38:17 +00:00
Greg Kaiser
82fdd04600 Merge "modules/power: Silence compiler warnings" am: cbd7b77367
am: 161beacc8c

Change-Id: I6c0687d79e04c5c5ec752e6aff111e25ca0658be
2016-08-25 16:34:48 +00:00
Greg Kaiser
161beacc8c Merge "modules/power: Silence compiler warnings"
am: cbd7b77367

Change-Id: I2f86d064f1e445591b6a4cfc4afe5c0e5089fe65
2016-08-25 16:31:49 +00: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
Dan Albert
a26bcd5424 Stop hard coding gmock things.
The headers are exported.

Change-Id: I72f8dda3f441bc72accce3c9e94a7160fcefc54c
Test: mma
2016-08-16 12:01:43 -07:00
Greg Kaiser
c9011b87c0 Merge "usbcamera: Fix compiler warnings" 2016-08-15 21:17:52 +00:00
Janis Danisevskis
3696685df4 add error code KM_ERROR_ATTESTATION_APPLICATION_ID_MISSING
This error code is required by keystore.

Bug: 22914603
Change-Id: Icda276cb6b6faf2c0bb0c98a3c5700612a92e51b
2016-08-10 09:48:27 +01:00
Janis Danisevskis
b62995e42e add tag KM_TAG_ATTESTATION_APPLICATION_ID
This tag is used by keystore for denoting key attestation
applications IDs

Bug: 22914603
Change-Id: Ie92352686123e0172ca0df20f54059a4c92c319c
2016-08-10 09:48:27 +01:00
Greg Kaiser
e523d58d2a Merge "modules/local_time: Silence compiler warning." 2016-08-08 22:27:37 +00:00
Greg Kaiser
e8343251f5 modules/local_time: Silence compiler warning.
Change-Id: If1fe4fcdf38171c696498d7a3d74d4a1fbb7b706
2016-08-08 13:57:40 -07:00
Nick Vaccaro
9c16bf3d96 Sensors: MultiHal: ignore errors from poll calls am: 59d9fb4f88
am: 3fa9ea788f

Change-Id: I1cedc295a1e56a2c1b894ad6c58c561babc9301c
2016-08-08 17:09:21 +00:00
Nick Vaccaro
3fa9ea788f Sensors: MultiHal: ignore errors from poll calls
am: 59d9fb4f88

Change-Id: Iaebf7d97b6ed89247a5e125930269ab01ccb52ea
2016-08-08 17:05:52 +00:00
Greg Kaiser
7a915effde usbcamera: Fix compiler warnings
Change-Id: Ifc9fec5e90f5295d2b4a5b4c8648510565b9ba17
2016-08-08 09:35:54 -07:00
Nick Vaccaro
59d9fb4f88 Sensors: MultiHal: ignore errors from poll calls
MultiHal was not properly fielding errors from the poll() calls of
sub-HALs.  Propagating errors received from sub-HALs up to Sensor
Services causes Sensor Services to abort, so instead of propagating
the error up to Sensor Services, the MultiHal logs a message to
logcat to fix the sub-HAL problem.

Bug: 30060537
Change-Id: I6e20c193a2f2d228da48cf3d5a23e439eaf663df
2016-08-05 21:04:24 -07:00
Chih-hung Hsieh
e7ade1f3b9 Merge "Fix clang-tidy performance warnings in libhardware." am: 1c1e311e06 am: 5f366ef448 am: 90383959ac
am: 31a6b95815

Change-Id: I6dcc98594a1f0861fa4af489eeb824562ad16bb4
2016-08-04 22:17:47 +00:00
Chih-Hung Hsieh
31a6b95815 Merge "Fix clang-tidy performance warnings in libhardware." am: 1c1e311e06 am: 5f366ef448
am: 90383959ac

Change-Id: I7cd8374bde5d8fab6c17b3f5386eb195f1adf1c7
2016-08-04 22:09:18 +00:00
Chih-hung Hsieh
90383959ac Merge "Fix clang-tidy performance warnings in libhardware." am: 1c1e311e06
am: 5f366ef448

Change-Id: I508c8edaaa897d5e2b9d3b47c63a82fd6806ea6a
2016-08-04 22:06:48 +00: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
Andre Eisenbach
0323f5e309 Merge "HFP 1.7 profile update (2/4)" am: 2ffbffae64 am: 30a9dc1e99 am: 6ad453da6e
am: d21d9ed357

Change-Id: I7b86114d0485b73251f4460511db89c9621dfd37
2016-08-04 02:29:22 +00:00
Mudumba Ananth
d21d9ed357 Merge "HFP 1.7 profile update (2/4)" am: 2ffbffae64 am: 30a9dc1e99
am: 6ad453da6e

Change-Id: Idab5453fb384bef7dcbaf5b0beede516420ef77a
2016-08-04 02:00:09 +00:00
Andre Eisenbach
6ad453da6e Merge "HFP 1.7 profile update (2/4)" am: 2ffbffae64
am: 30a9dc1e99

Change-Id: I5e7871f81ad9eda61c134cdaa4b5257fa80cdfd1
2016-08-04 01:47:05 +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
7e1c68a361 Merge "Remove write type from GATT descriptor writes (3/4)" am: 8e9bc1bb9e am: 63b880fb8c am: 8bd87c51bf
am: 6169db292f

Change-Id: Id8c9e5b4670ef5dbdc8d406cc32c7c601e8d01ff
2016-08-04 00:34:14 +00:00
Jakub Pawlowski
6169db292f Merge "Remove write type from GATT descriptor writes (3/4)" am: 8e9bc1bb9e am: 63b880fb8c
am: 8bd87c51bf

Change-Id: Ia99c001fa42b7448863d16e8bdfb13aab55e7ea2
2016-08-04 00:19:17 +00:00
Jakub Pawlowski
8bd87c51bf Merge "Remove write type from GATT descriptor writes (3/4)" am: 8e9bc1bb9e
am: 63b880fb8c

Change-Id: If9d04965fcf1dcdfad8b0846a75ef375be930cba
2016-08-04 00:12:47 +00: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
ecd5f81f63 Merge "GATT Server refactoring (1/4)" am: 7e3cfe3081 am: b815613e3c am: db8127a7e2
am: 6104fe5e2d

Change-Id: I2eca4450751437860542faa522778dc9c501db6c
2016-08-03 20:24:22 +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
6104fe5e2d Merge "GATT Server refactoring (1/4)" am: 7e3cfe3081 am: b815613e3c
am: db8127a7e2

Change-Id: I2dd2fc1d5c123468fd55cc353c41bd3b9601a1b4
2016-08-03 13:12:04 +00:00
Jakub Pawlowski
db8127a7e2 Merge "GATT Server refactoring (1/4)" am: 7e3cfe3081
am: b815613e3c

Change-Id: I189bae02003f3e4ed9f3e87a90e08b9b7670a059
2016-08-03 13:05:52 +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
vivek mehta
27258e5ce4 audio: add key to control AANC runtime
- add AANC key to enable\disable AANC runtime

Bug: 29111687

Change-Id: I5c64b190b336a834cf6793ed37a511a54c7a202e
2016-08-02 16:57:39 -07: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
Greg Kaiser
a6de449b50 Merge "hwcomposer: Fix compiler warnings" 2016-07-20 13:30:37 +00:00