Greg Hackmann
b283598bad
am 06c19bd0
: am 2d91d000
: Merge "Revert "gralloc: Add asynchronous lock/unlock API""
...
* commit '06c19bd047d63adcf99094f6f0dd17b58150bba6':
Revert "gralloc: Add asynchronous lock/unlock API"
2014-05-09 21:51:51 +00:00
Greg Hackmann
06c19bd047
am 2d91d000
: Merge "Revert "gralloc: Add asynchronous lock/unlock API""
...
* commit '2d91d000bce3db23ac51888d109c9f29272ea96a':
Revert "gralloc: Add asynchronous lock/unlock API"
2014-05-09 21:46:45 +00:00
Greg Hackmann
2d91d000bc
Merge "Revert "gralloc: Add asynchronous lock/unlock API""
2014-05-09 21:39:10 +00:00
Greg Hackmann
fd9dc63027
Revert "gralloc: Add asynchronous lock/unlock API"
...
This reverts commit 2861789f4f
.
Change-Id: I334b8ca9b9fdef510df514c18aabb6a593dfaa75
2014-05-09 21:36:14 +00:00
Greg Hackmann
62cff27d48
am 5a1ca138
: am e79f167e
: Merge "gralloc: Add asynchronous lock/unlock API"
...
* commit '5a1ca138be2e45284a3a5ad33977ee774a57a56d':
gralloc: Add asynchronous lock/unlock API
2014-05-09 21:13:17 +00:00
Greg Hackmann
5a1ca138be
am e79f167e
: Merge "gralloc: Add asynchronous lock/unlock API"
...
* commit 'e79f167e4a997b92d2da8e14a8a78c557503b48a':
gralloc: Add asynchronous lock/unlock API
2014-05-09 21:08:39 +00:00
Greg Hackmann
e79f167e4a
Merge "gralloc: Add asynchronous lock/unlock API"
2014-05-09 21:02:07 +00:00
Nick Vaccaro
c76513507b
am d34ed32e
: Change MultiHal API version to 1.1
...
* commit 'd34ed32e06045c5a55b4d25247a98fa64c233bfe':
Change MultiHal API version to 1.1
2014-05-06 17:42:28 +00:00
Nick Vaccaro
d34ed32e06
Change MultiHal API version to 1.1
...
Bug: 14451762
Change-Id: Id16fa71ae7382689ce141a92eb974b208e20327b
2014-05-05 17:56:32 -07:00
Francis Hart
2861789f4f
gralloc: Add asynchronous lock/unlock API
...
The existing API exposed to clients for software lock/unlock forces the gralloc
implementation to complete these operations synchronously. This change adds new
entry points for lock/unlock functionality that is suited for use with Android's
explicit synchronisation concept. This provides scope for the gralloc module
to internally optimise the work it must do for lock/unlock and to hide this cost
from the client.
Change-Id: I6c41f4a532b705fc76c7777b2f04ea293506b381
2014-05-02 19:46:58 +00:00
Bill Yi
0512ec33ff
am 08e9b2a4
: Merge commit \'f404dc42d6677a1aee88d1ce996a7e8e4afe55bb\' into HEAD
...
* commit '08e9b2a43d43a23067e577b5bd83a41964e70107':
2014-04-30 00:59:02 +00:00
Jinsuk Kim
85425cfe89
am c2a0b248
: Merge "Update HDMI-CEC HAL interface definition" into klp-modular-dev
...
* commit 'c2a0b2484ab80351ad18fb0b8337a8150e656b93':
Update HDMI-CEC HAL interface definition
2014-04-29 21:34:58 +00:00
Jinsuk Kim
c2a0b2484a
Merge "Update HDMI-CEC HAL interface definition" into klp-modular-dev
2014-04-29 21:32:30 +00:00
Bill Yi
08e9b2a43d
Merge commit 'f404dc42d6677a1aee88d1ce996a7e8e4afe55bb' into HEAD
2014-04-29 11:34:21 -07:00
Colin Cross
6322562d0f
am c070bad4
: Merge changes I672d4ee8,I6a2183b5,If0c0135e
...
* commit 'c070bad435799b4febdd2acf6be6c191f15f724e':
usbaudio: allow compiling for 64-bit
audio_remote_submix: allow compiling for 64-bit
audio: allow compiling for 64-bit
2014-04-21 13:45:30 +00:00
Colin Cross
c070bad435
Merge changes I672d4ee8,I6a2183b5,If0c0135e
...
* changes:
usbaudio: allow compiling for 64-bit
audio_remote_submix: allow compiling for 64-bit
audio: allow compiling for 64-bit
2014-04-19 00:11:29 +00:00
Colin Cross
732b92a1d6
usbaudio: allow compiling for 64-bit
...
Set -Wno-unused-parameter, which makes the directory warnings-clean
on 32-bit and 64-bit.
Remove LOCAL_32_BIT_ONLY.
Change-Id: I672d4ee8d9e70c75f9376ca60389af08f73166b8
2014-04-18 15:50:32 -07:00
Colin Cross
5685a0845e
audio_remote_submix: allow compiling for 64-bit
...
Fix a few 64-bit warnings and set -Wno-unused-parameter, which makes
the directory warnings-clean on 32-bit and 64-bit.
Remove LOCAL_32_BIT_ONLY.
Change-Id: I6a2183b5bb0cdf438a04de967995da7b1e2e3854
2014-04-18 15:46:46 -07:00
Colin Cross
0dbcdf3aff
audio: allow compiling for 64-bit
...
Set -Wno-unused-parameter, which makes the directory warnings-clean
on 32-bit and 64-bit.
Remove LOCAL_32_BIT_ONLY.
Change-Id: If0c0135e57935d785a0f36b7d5187ac567c7e21c
2014-04-18 15:46:30 -07:00
Kenny Root
2131c7c599
am cb3a62ea
: Merge "keymaster: add flags indicating feature support"
...
* commit 'cb3a62ea2f9a08dbe83ff68685f6361a5d015345':
keymaster: add flags indicating feature support
2014-04-18 21:15:30 +00:00
Kenny Root
cb3a62ea2f
Merge "keymaster: add flags indicating feature support"
2014-04-18 18:50:01 +00:00
Aaron Whyte
dbcec633d3
am dd6e1a01
: Merge "Reduced most MultiHal ALOGI to ALOGV, reducing bootup logspam." into klp-modular-dev
...
* commit 'dd6e1a018e318d8f95d507a2b7fc54eaa0fcabf5':
Reduced most MultiHal ALOGI to ALOGV, reducing bootup logspam.
2014-04-16 20:33:03 +00:00
Aaron Whyte
dd6e1a018e
Merge "Reduced most MultiHal ALOGI to ALOGV, reducing bootup logspam." into klp-modular-dev
2014-04-16 20:29:56 +00:00
Ariel Gertzenstein
311c8922d7
am 40208a8b
: DO NOT MERGE Fix PAN control callback definition to match what bluedroid is doing.
...
* commit '40208a8b2baf9629c12966e52f2f901b3019670c':
DO NOT MERGE Fix PAN control callback definition to match what bluedroid is doing.
2014-04-16 19:44:42 +00:00
Ariel Gertzenstein
40208a8b2b
DO NOT MERGE Fix PAN control callback definition to match what bluedroid is doing.
...
There's a discrepancy in the order of arguments between the interface
and the implementation. bluedroid swaps the |error| and |local_role|
arguments when calling back so this change redefines the interface
for consistency.
http://b/12853951
Change-Id: I0ccfc6d6d2002d647d484ab7f53744863b569502
2014-04-16 14:53:45 -04:00
Aaron Whyte
f22e1c1808
Reduced most MultiHal ALOGI to ALOGV, reducing bootup logspam.
...
Bug: 14084750
Change-Id: I099aaaa24caf0213af373b5a600616674349ff95
2014-04-15 16:22:05 -07:00
Aaron Whyte
da38fb2d13
am 4d7ac52d
: Fixed multihal handling of nonexistent sensor handles.
...
* commit '4d7ac52d75b725ff25d68416747bfd43bbbc065d':
Fixed multihal handling of nonexistent sensor handles.
2014-04-15 18:26:06 +00:00
Aaron Whyte
4d7ac52d75
Fixed multihal handling of nonexistent sensor handles.
...
This prevents crashes and undefined behavior when someone
calls sensor HAL methods with nonexistent handles.
It also adds checks and warnings if bad sensor HALs provide
garbage sensor handles in their sensor events.
Tested by making sure pedometer and tilt still work.
Bug: 13513595
Change-Id: Ie1489d3f2972bec82ee1c73189e532f6658d1eca
2014-04-15 11:00:14 -07:00
Jinsuk Kim
f02ed91f7a
Update HDMI-CEC HAL interface definition
...
Previously it was HAL that was responsible for the logical address
allocation. The address allocation logic itself is based on the algorithm
specified in the CEC standard, is dependent neither on vendor nor
on hardware. This CL replaces the method 'allocate_logical_address',
'get_logical_address' with 'add_logical_address', so that the common
allocation logic will be implemented in the cec service and can be used by
all vendors without having them put the same logic in all HAL
implementations. HAL is supposed to be passed the allocated address
and use it to configure the chipset in this new definition.
The change in the service that implements the address allocation logic
will be done in a follow up CL.
Also removed the description in 'get_version' about version number.
It needs not be in the description since it is an implementation detail.
Change-Id: I33f31580792785bec38b7bd6997f91b89bfbb500
2014-04-13 06:49:32 +09:00
Aravind Akella
7e02753740
am d5b3c73d
: Merge "DO NOT MERGE Add heart rate monitor, stringType and requiredPermissions to sensors.h" into klp-modular-dev
...
* commit 'd5b3c73d80ec851296037d2c7ed011ac306eb2f5':
DO NOT MERGE Add heart rate monitor, stringType and requiredPermissions to sensors.h
2014-04-11 19:34:53 +00:00
Aravind Akella
d5b3c73d80
Merge "DO NOT MERGE Add heart rate monitor, stringType and requiredPermissions to sensors.h" into klp-modular-dev
2014-04-11 19:32:14 +00:00
Aravind Akella
b20f1a3eaf
DO NOT MERGE Add heart rate monitor, stringType and requiredPermissions to sensors.h
...
This reverts commit d27d819897
.
Change-Id: Ic66b792c8229867fa5ff760cdde3d7c6f3360296
2014-04-08 18:55:50 +00:00
Etienne Le Grand
e6bee25064
am 71a50543
: Merge "Revert "Add heart rate monitor, stringType and requiredPermissions to sensors.h"" into klp-modular-dev
...
* commit '71a50543134b56055ab5be1262495bc3c7ec0c74':
Revert "Add heart rate monitor, stringType and requiredPermissions to sensors.h"
2014-04-05 09:05:55 +00:00
Etienne Le Grand
71a5054313
Merge "Revert "Add heart rate monitor, stringType and requiredPermissions to sensors.h"" into klp-modular-dev
2014-04-05 05:01:34 +00:00
Etienne Le Grand
d27d819897
Revert "Add heart rate monitor, stringType and requiredPermissions to sensors.h"
...
This reverts commit 0b8ec4f71f
.
Change-Id: I99051b6941cad570aef45ff568d1777f881fc33b
2014-04-05 05:01:27 +00:00
Etienne Le Grand
66fad0e3e7
am 61c78d98
: Merge "Add heart rate monitor, stringType and requiredPermissions to sensors.h" into klp-modular-dev
...
* commit '61c78d9804625ea2ec56c855602682aaa7dd5a75':
Add heart rate monitor, stringType and requiredPermissions to sensors.h
2014-04-05 01:48:40 +00:00
Etienne Le Grand
61c78d9804
Merge "Add heart rate monitor, stringType and requiredPermissions to sensors.h" into klp-modular-dev
2014-04-05 01:44:19 +00:00
Etienne Le Grand
0b8ec4f71f
Add heart rate monitor, stringType and requiredPermissions to sensors.h
...
Change-Id: I376e4dbb13d64f4987d4a8be82afddb625eefa54
2014-04-03 12:50:11 -07:00
Zhihai Xu
ec580a3fd3
am 925855b5
: Merge "LE: Add API to configure MTU for a given connection (1/4)" into klp-modular-dev
...
* commit '925855b5de013cb709fb2d88d840f9c6e71cdcf6':
LE: Add API to configure MTU for a given connection (1/4)
2014-03-31 21:25:03 +00:00
Zhihai Xu
925855b5de
Merge "LE: Add API to configure MTU for a given connection (1/4)" into klp-modular-dev
2014-03-31 21:21:17 +00:00
Jinsuk Kim
b9254286c9
am 3bc29d3e
: Merge "Added message_abort and operand enums" into klp-modular-dev
...
* commit '3bc29d3e0a08bee19a43a61ce77b1b86a1cda436':
Added message_abort and operand enums
2014-03-31 01:44:52 +00:00
Jinsuk Kim
3bc29d3e0a
Merge "Added message_abort and operand enums" into klp-modular-dev
2014-03-31 01:40:01 +00:00
Eino-Ville Talvala
ab14046292
am 37de84bc
: Merge "Camera2 Test: fix test criteria for exposure time"
...
* commit '37de84bc96f808601897bcd126b73fc839fd2c20':
Camera2 Test: fix test criteria for exposure time
2014-03-29 01:02:57 +00:00
Eino-Ville Talvala
37de84bc96
Merge "Camera2 Test: fix test criteria for exposure time"
2014-03-29 00:55:56 +00:00
Gaurav Batra
a1bef2b9a6
Camera2 Test: fix test criteria for exposure time
...
Add some tolerance while testing requested exposure times against capture times.
Change-Id: I609e7819cde8ee466e152775781a6542e6686ded
2014-03-28 17:03:36 -07:00
Andre Eisenbach
8a4b61a909
LE: Add API to configure MTU for a given connection (1/4)
...
bug:13571470
Change-Id: Ia473998b714c3968c75565adeef20fef5656abb4
2014-03-25 17:32:57 -07:00
Nick Vaccaro
286c139bcc
am 93bf9964
: Fix sensor multi hal crash when sub-HAL reports an error
...
* commit '93bf99647b0d33dfe12deecef828b6bcb568cafe':
Fix sensor multi hal crash when sub-HAL reports an error
2014-03-25 20:23:05 +00:00
Jinsuk Kim
efbdb25d1b
Added message_abort and operand enums
...
Also clarfieid the method description (allocate_logical_address),
update method signatures to use more appropriate type.
Change-Id: Ie5d13969308e77ca19b3dbde682ca968337ab41b
2014-03-24 13:43:47 +09:00
Nick Vaccaro
93bf99647b
Fix sensor multi hal crash when sub-HAL reports an error
...
Fix a null pointer dereference bug that caused the multihal to crash
in an endless loop continuously trying to open a sensor HAL when it
reports back an error.
Change-Id: I6d82e8fdd9acde53f378a5fb3dfdb02c39d7b433
2014-03-17 13:05:09 -07:00
Glenn Kasten
f404dc42d6
am 5106ad0c
: Merge "Audio HALs are 32-bit only"
...
* commit '5106ad0c6e664a622d177d997d3ec7147ef1ae8f':
Audio HALs are 32-bit only
2014-03-13 23:18:56 +00:00