Commit graph

3341 commits

Author SHA1 Message Date
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
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
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
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
Nick Vaccaro
b98d10b44f Merge \\\\"DO NOT MERGE ANYWHERE Sensors: MultiHal: ignore errors from poll calls\\\\" into cw-e-dev am: f7eed1ea07 -s ours am: df20006a10 -s ours am: 2537c546f3 -s ours
am: 953fa6557f  -s ours

Change-Id: I89fbc61943f13d804b68e6e16133ec6f9bd74380
2016-07-20 00:42:39 +00:00
Nick Vaccaro
d96c6333ff Merge \\\\"DO NOT MERGE ANYWHERE Sensors: MultiHal: ignore errors from poll calls\\\\" into cw-e-dev am: f7eed1ea07 -s ours am: df20006a10 -s ours am: 2537c546f3 -s ours
am: 890a976bb9  -s ours

Change-Id: Ie6a5f522cf91f3c9dde18e648fea3a5bb12747a6
2016-07-20 00:40:05 +00:00
Nick Vaccaro
890a976bb9 Merge \\\"DO NOT MERGE ANYWHERE Sensors: MultiHal: ignore errors from poll calls\\\" into cw-e-dev am: f7eed1ea07 -s ours am: df20006a10 -s ours
am: 2537c546f3  -s ours

Change-Id: I135fc8f84e358a0af581a8b10632035372c5450d
2016-07-20 00:37:41 +00:00
Nick Vaccaro
953fa6557f Merge \\\"DO NOT MERGE ANYWHERE Sensors: MultiHal: ignore errors from poll calls\\\" into cw-e-dev am: f7eed1ea07 -s ours am: df20006a10 -s ours
am: 2537c546f3  -s ours

Change-Id: Iee4f97d474eff692bec9d9ee12ee92398f5a2ff0
2016-07-20 00:37:41 +00:00
Nick Vaccaro
2537c546f3 Merge \\"DO NOT MERGE ANYWHERE Sensors: MultiHal: ignore errors from poll calls\\" into cw-e-dev am: f7eed1ea07 -s ours
am: df20006a10  -s ours

Change-Id: I2e73c8d4a4fd201a4e8ec1040b229440a4b365c9
2016-07-20 00:35:07 +00:00
Nick Vaccaro
df20006a10 Merge \"DO NOT MERGE ANYWHERE Sensors: MultiHal: ignore errors from poll calls\" into cw-e-dev
am: f7eed1ea07  -s ours

Change-Id: I48415c2c6aed8f18212b239469a9c66894f753af
2016-07-20 00:32:34 +00:00
Nick Vaccaro
f7eed1ea07 Merge "DO NOT MERGE ANYWHERE Sensors: MultiHal: ignore errors from poll calls" into cw-e-dev 2016-07-19 23:55:21 +00:00
Nick Vaccaro
877af59f24 DO NOT MERGE ANYWHERE 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-07-19 16:43:21 -07:00
Chenjie Luo
f8c1978da1 Merge \"power: Adds POWER_HINT_DISABLE_TOUCH\" into nyc-mr1-dev
am: 3653956398

Change-Id: I98fe9bc61b201401f4e38f76fdb4dc51eff1960a
2016-07-19 16:40:49 +00:00
Chenjie Luo
3653956398 Merge "power: Adds POWER_HINT_DISABLE_TOUCH" into nyc-mr1-dev 2016-07-19 16:34:51 +00:00
Android Build Merger (Role)
654e17f11c Merge "DO NOT MERGE ANYWHERE power: Adds POWER_HINT_DISABLE_TOUCH am: 2df182d7b1 -s ours am: 3e8005b289 -s ours am: daddf59fe6 -s ours am: 8ae3d7582a -s ours" into nyc-mr1-dev-plus-aosp 2016-07-18 23:48:21 +00:00
Android Build Merger (Role)
e2298972ec Merge "DO NOT MERGE ANYWHERE power: Adds POWER_HINT_DISABLE_TOUCH am: 2df182d7b1 -s ours am: 3e8005b289 -s ours am: daddf59fe6 -s ours am: 29716dcc6b -s ours" into nyc-mr1-dev-plus-aosp 2016-07-18 23:48:19 +00:00
Android Build Merger (Role)
c0f882e78b Merge "DO NOT MERGE ANYWHERE Add new power hints for launch activity am: a2aa3f358f -s ours am: 145907b2f5 -s ours am: 45d1d74210 -s ours am: 1417c5bb1c -s ours" into nyc-mr1-dev-plus-aosp 2016-07-18 23:48:15 +00:00
Chenjie Luo
7c8244f012 DO NOT MERGE ANYWHERE power: Adds POWER_HINT_DISABLE_TOUCH am: 2df182d7b1 -s ours am: 3e8005b289 -s ours am: daddf59fe6 -s ours
am: 8ae3d7582a  -s ours

Change-Id: Ic613fc32929ce162c5646d8739fad76ba3194620
2016-07-18 23:47:53 +00:00
Chenjie Luo
3a1add4f34 DO NOT MERGE ANYWHERE power: Adds POWER_HINT_DISABLE_TOUCH am: 2df182d7b1 -s ours am: 3e8005b289 -s ours am: daddf59fe6 -s ours
am: 29716dcc6b  -s ours

Change-Id: Iad10d6dde05e7d61078814301aed0b8825141b31
2016-07-18 23:47:53 +00:00
Wei Wang
3afb45271e DO NOT MERGE ANYWHERE Add new power hints for launch activity am: a2aa3f358f -s ours am: 145907b2f5 -s ours am: 45d1d74210 -s ours
am: 73917a8f79  -s ours

Change-Id: I3cd03e86669ce1d297ce36ab94f481b801d3da93
2016-07-18 23:47:53 +00:00
Wei Wang
26af2dd93e DO NOT MERGE ANYWHERE Add new power hints for launch activity am: a2aa3f358f -s ours am: 145907b2f5 -s ours am: 45d1d74210 -s ours
am: 1417c5bb1c  -s ours

Change-Id: I7eb5a80b3bc32a70d2c7c21c1191f0e3771e5215
2016-07-18 23:47:52 +00:00
Chenjie Luo
29716dcc6b DO NOT MERGE ANYWHERE power: Adds POWER_HINT_DISABLE_TOUCH am: 2df182d7b1 -s ours am: 3e8005b289 -s ours
am: daddf59fe6  -s ours

Change-Id: I9a49c02e5f6992425e7b41a3f4381a31c5f1f910
2016-07-18 23:45:23 +00:00
Wei Wang
1417c5bb1c DO NOT MERGE ANYWHERE Add new power hints for launch activity am: a2aa3f358f -s ours am: 145907b2f5 -s ours
am: 45d1d74210  -s ours

Change-Id: I4689365f8c48e94160bc6c74ab1ff86a6f81e8c4
2016-07-18 23:45:23 +00:00
Chenjie Luo
8ae3d7582a DO NOT MERGE ANYWHERE power: Adds POWER_HINT_DISABLE_TOUCH am: 2df182d7b1 -s ours am: 3e8005b289 -s ours
am: daddf59fe6  -s ours

Change-Id: I4c53cc949a6b429b54f2cc09013dd8869573b87b
2016-07-18 23:45:22 +00:00
Wei Wang
73917a8f79 DO NOT MERGE ANYWHERE Add new power hints for launch activity am: a2aa3f358f -s ours am: 145907b2f5 -s ours
am: 45d1d74210  -s ours

Change-Id: I88a3ad53459c50e9b5ef80ad934643c3728f0b8e
2016-07-18 23:45:22 +00:00
Chenjie Luo
daddf59fe6 DO NOT MERGE ANYWHERE power: Adds POWER_HINT_DISABLE_TOUCH am: 2df182d7b1 -s ours
am: 3e8005b289  -s ours

Change-Id: Ie308c154a314faf32ca21f6913053753549a6f29
2016-07-18 23:42:58 +00:00
Wei Wang
45d1d74210 DO NOT MERGE ANYWHERE Add new power hints for launch activity am: a2aa3f358f -s ours
am: 145907b2f5  -s ours

Change-Id: Iffa33cd078e302c60ed8d9d5e2ab082058122761
2016-07-18 23:42:58 +00:00
Chenjie Luo
3e8005b289 DO NOT MERGE ANYWHERE power: Adds POWER_HINT_DISABLE_TOUCH
am: 2df182d7b1  -s ours

Change-Id: I2e8f3feb242c8abf1410c49cc218becd4caf2e6a
2016-07-18 23:40:20 +00:00
Wei Wang
145907b2f5 DO NOT MERGE ANYWHERE Add new power hints for launch activity
am: a2aa3f358f  -s ours

Change-Id: I1cde82735cc43082f63e2ae901afb6faeec1c92e
2016-07-18 23:40:19 +00:00
Chenjie Luo
fc40b05ae1 power: Adds POWER_HINT_DISABLE_TOUCH
POWER_HINT_DISABLE_TOUCH is used to hint power hal that device is
in a state that touch controller could be disabled to save power.

Bug: 30143923
Change-Id: I56c588e62afadffdb367b6e2c3115cffef51bb45
(cherry picked from commit 90db35122d)
2016-07-18 23:23:54 +00:00
Chenjie Luo
2df182d7b1 DO NOT MERGE ANYWHERE power: Adds POWER_HINT_DISABLE_TOUCH
POWER_HINT_DISABLE_TOUCH is used to hint power hal that device is
in a state that touch controller could be disabled to save power.

Bug: 30143923
Change-Id: I56c588e62afadffdb367b6e2c3115cffef51bb45
(cherry picked from commit 90db35122d)
2016-07-18 16:16:45 -07:00
Wei Wang
a2aa3f358f DO NOT MERGE ANYWHERE Add new power hints for launch activity
BUG: 28220567
Change-Id: I6da77240cdca5caa2e8504c36e83287954fd6ffc
(cherry picked from commit a787ab79e5)
2016-07-18 23:01:32 +00:00
Andy Hung
03ed3e9be0 Merge \"Improve stub hal read and write timing\" into nyc-mr1-dev
am: 4d2023e33a

Change-Id: Ifde2c9c73e963c1513c1fd1bd82df1009963a676
2016-07-15 05:12:25 +00:00
Andy Hung
4d2023e33a Merge "Improve stub hal read and write timing" into nyc-mr1-dev 2016-07-15 05:06:15 +00:00
Dan Stoza
9ca84d68b1 HWC2: Add SKIP_CLIENT_COLOR_TRANSFORM capability
am: e87229e267

Change-Id: I461573fd9bacae2c8cd67ddbba2dc208849af81a
2016-07-14 21:50:24 +00:00
Dan Stoza
a8597ebd82 HWC2: Redefine retire fence as present fence
am: 814421ec1d

Change-Id: I07812bda07c2a24fce2d2acce0b0e0ed05558bc0
2016-07-14 20:25:48 +00:00
Dan Stoza
e87229e267 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-07-14 12:08:13 -07:00
Dan Stoza
814421ec1d 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-07-14 09:10:32 -07:00
Dan Willemsen
0002fe0e75 resolve merge conflicts of 69ed5d9 to stage-aosp-master am: d269bf4328
am: c1965c958c

Change-Id: I8b58348b884eedac1852984c65f87f014256b4d0
2016-07-13 19:26:54 +00:00
Dan Willemsen
c1965c958c resolve merge conflicts of 69ed5d9 to stage-aosp-master
am: d269bf4328

Change-Id: I1db9a613f52dcaaef3d7f50d2cb797be7cfd82e0
2016-07-13 19:23:17 +00:00