Commit graph

1393 commits

Author SHA1 Message Date
David Turner
611a3b7143 am 3e618a6a: Merge "gralloc: let target configure page flipping ioctl"
* commit '3e618a6aa10c783d1536f20edfc3347939cfa18e':
  gralloc: let target configure page flipping ioctl
2014-07-04 13:30:22 +00:00
David Turner
3e618a6aa1 Merge "gralloc: let target configure page flipping ioctl" 2014-07-04 08:02:36 +00:00
Brian Carlstrom
18cf130c43 Fix my-dir issue
(cherry picked from commit 52f493189b02c44c6dc329c86da3176ac9c22ad3)

Change-Id: I3dcca1fc0fb9d58f0d2f3867f8ab89f87a983cc1
2014-07-02 09:38:41 -07:00
Nick Vaccaro
aa13433c89 am c384b186: Don\'t pass up bad sensor event packets to Sensor Services
* commit 'c384b1863768d424116c1bcc7f26f5764c35c330':
  Don't pass up bad sensor event packets to Sensor Services
2014-06-11 19:53:01 +00:00
Nick Vaccaro
c384b18637 Don't pass up bad sensor event packets to Sensor Services
If an event packet is read containing an unknown sensor handle,
don't pass it on to Sensor Services. Drop it on the floor instead
as it's causing Sensor Services to crash.

Moved read of queue size in sensors_poll_context_t::poll() to post
queue mutex grab for safety.

Bug: 15285345
Change-Id: I2ebc0f8591a1ae60f09bf9599b8321c5a3dfae69
2014-06-11 10:42:07 -07:00
Bernhard Rosenkraenzer
5641642a20 gralloc: let target configure page flipping ioctl
Let vendor choose which framebuffer ioctl (FBIOPUT_VSCREENINFO or
FBIOPAN_DISPLAY) is best suited to do page-flip on its target platform.
Neither API is well documented about their usage and most of the
time it really depends on the respective framebuffer driver implementation.

* Default ioctl to do page-flip is FBIOPUT_VSCREENINFO.
* Set "TARGET_USE_PAN_DISPLAY=true" in board config file to use FBIOPAN_DISPLAY.

Change-Id: Ic3a50bd0f5fe37ac0149e11649c4abdadea85529
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
2014-06-02 17:41:36 +05:30
Etienne Le Grand
ec9236ef18 am ef2c616c: Merge "Update definition of the heart rate monitor to include confidence" into klp-modular-dev
* commit 'ef2c616c4e45eaa1e621aa69bffb7438b1c64755':
  Update definition of the heart rate monitor to include confidence
2014-05-27 18:10:16 +00:00
Etienne Le Grand
ef2c616c4e Merge "Update definition of the heart rate monitor to include confidence" into klp-modular-dev 2014-05-27 18:03:06 +00:00
Dmitry Grinberg
b752c08d13 am 19f3696f: bt: add interface function to provide wakelock access
* commit '19f3696f852d6787076b70a7d31f5684ad2aa93f':
  bt: add interface function to provide wakelock access
2014-05-23 21:35:42 +00:00
Etienne Le Grand
7b36158da7 Update definition of the heart rate monitor to include confidence
Change-Id: I88a8cddf647f77588a283c16d37f3f99ecda3115
2014-05-23 13:07:08 -07:00
Dmitry Grinberg
19f3696f85 bt: add interface function to provide wakelock access
Change-Id: I7ea173aee49ae7fdfe81a24a9b3666efc1c29ed4
2014-05-22 19:26:25 -07:00
Nick Vaccaro
f8cbc9e65c am ad70dc48: add /system/vendor/lib as valid search path for sensor HALs
* commit 'ad70dc482f044b1ef03ef1aa74b6e2c5a446d32b':
  add /system/vendor/lib as valid search path for sensor HALs
2014-05-15 21:45:47 +00:00
Nick Vaccaro
ad70dc482f add /system/vendor/lib as valid search path for sensor HALs
MultiHal will now accept sensor HALs listed in the hals.conf file that
reside in either /system/lib/hw or /system/vendor/lib.

Bug: 14994424
Change-Id: I13f17352b97c36b97cfbcee8c9b6a0d2e1ed6dc3
2014-05-15 14:31:51 -07:00
Greg Hackmann
7c05b1d8f9 am 6f91ded5: am c63ec07b: Merge "gralloc: Add asynchronous lock/unlock API"
* commit '6f91ded57bf133fbf572cde2f5623bb8289f7eaa':
  gralloc: Add asynchronous lock/unlock API
2014-05-12 18:12:33 +00:00
Greg Hackmann
6f91ded57b am c63ec07b: Merge "gralloc: Add asynchronous lock/unlock API"
* commit 'c63ec07b3ca11de8e0321a0875119427bb0bad86':
  gralloc: Add asynchronous lock/unlock API
2014-05-12 18:08:12 +00:00
Greg Hackmann
c63ec07b3c Merge "gralloc: Add asynchronous lock/unlock API" 2014-05-12 18:01:56 +00:00
Francis Hart
2e49f9acbb 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: If4b1bb5490ab2b20d796214a7da8a96427cfe52d
2014-05-12 09:13:35 -07:00
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